improve sys_newuname() for compat architectures

[safe/jmp/linux-2.6] / arch / parisc / kernel / syscall_table.S

diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 7f037b7..3d52c97 100644 (file)
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -10,7 +10,7 @@
  *    Copyright (C) 2000 Grant Grundler <grundler at parisc-linux.org>
  *    Copyright (C) 2001 Richard Hirst <rhirst with parisc-linux.org>
  *    Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org>
- *    Copyright (C) 2001 Helge Deller <deller at parisc-linux.org>
+ *    Copyright (C) 2001-2007 Helge Deller <deller at parisc-linux.org>
  *    Copyright (C) 2000-2001 Thomas Bogendoerfer <tsbogend at parisc-linux.org>
  *    Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org>
  *    Copyright (C) 2005-2006 Kyle McMartin <kyle at parisc-linux.org>
@@ -30,11 +30,6 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#undef ENTRY_SAME
-#undef ENTRY_DIFF
-#undef ENTRY_UHOH
-#undef ENTRY_COMP
-#undef ENTRY_OURS
 #if defined(CONFIG_64BIT) && !defined(SYSCALL_TABLE_64BIT)
 /* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and
  * narrow palinux.  Use ENTRY_DIFF for those where a 32-bit specific
@@ -92,7 +87,7 @@
        ENTRY_SAME(setuid)
        ENTRY_SAME(getuid)
        ENTRY_COMP(stime)               /* 25 */
-       ENTRY_SAME(ptrace)
+       ENTRY_COMP(ptrace)
        ENTRY_SAME(alarm)
        /* see stat comment */
        ENTRY_COMP(newfstat)
@@ -132,10 +127,10 @@
        ENTRY_SAME(socketpair)
        ENTRY_SAME(setpgid)
        ENTRY_SAME(send)
-       ENTRY_OURS(newuname)
+       ENTRY_SAME(newuname)
        ENTRY_SAME(umask)               /* 60 */
        ENTRY_SAME(chroot)
-       ENTRY_SAME(ustat)
+       ENTRY_COMP(ustat)
        ENTRY_SAME(dup2)
        ENTRY_SAME(getppid)
        ENTRY_SAME(getpgrp)             /* 65 */
@@ -154,8 +149,8 @@
        ENTRY_COMP(getrlimit)
        ENTRY_COMP(getrusage)
        /* struct timeval and timezone are maybe?? consistent wide and narrow */
-       ENTRY_DIFF(gettimeofday)
-       ENTRY_DIFF(settimeofday)
+       ENTRY_COMP(gettimeofday)
+       ENTRY_COMP(settimeofday)
        ENTRY_SAME(getgroups)           /* 80 */
        ENTRY_SAME(setgroups)
        /* struct socketaddr... */
@@ -197,7 +192,7 @@
        /* struct rusage contains longs... */
        ENTRY_COMP(wait4)
        ENTRY_SAME(swapoff)             /* 115 */
-       ENTRY_DIFF(sysinfo)
+       ENTRY_COMP(sysinfo)
        ENTRY_SAME(shutdown)
        ENTRY_SAME(fsync)
        ENTRY_SAME(madvise)
@@ -227,9 +222,7 @@
        ENTRY_SAME(setfsgid)
        /* I think this might work */
        ENTRY_SAME(llseek)              /* 140 */
-       /* struct linux_dirent has longs, like 'unsigned long d_ino' which
-        * almost definitely should be 'ino_t d_ino' but it's too late now */
-       ENTRY_DIFF(getdents)
+       ENTRY_COMP(getdents)
        /* it is POSSIBLE that select will be OK because even though fd_set
         * contains longs, the macros and sizes are clever. */
        ENTRY_COMP(select)
@@ -241,7 +234,7 @@
        ENTRY_SAME(getsid)
        ENTRY_SAME(fdatasync)
        /* struct __sysctl_args is a mess */
-       ENTRY_DIFF(sysctl)
+       ENTRY_COMP(sysctl)
        ENTRY_SAME(mlock)               /* 150 */
        ENTRY_SAME(munlock)
        ENTRY_SAME(mlockall)
@@ -282,7 +275,7 @@
         * to worry about faulting trying to copy in a larger 64-bit
         * struct from a 32-bit user-space app.
         */
-       ENTRY_SAME(rt_sigqueueinfo)
+       ENTRY_COMP(rt_sigqueueinfo)
        ENTRY_COMP(rt_sigsuspend)
        ENTRY_SAME(chown)               /* 180 */
        /* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */
@@ -377,9 +370,9 @@
        ENTRY_SAME(inotify_init)
        ENTRY_SAME(inotify_add_watch)   /* 270 */
        ENTRY_SAME(inotify_rm_watch)
+       ENTRY_SAME(migrate_pages)
        ENTRY_COMP(pselect6)
        ENTRY_COMP(ppoll)
-       ENTRY_SAME(migrate_pages)
        ENTRY_COMP(openat)              /* 275 */
        ENTRY_SAME(mkdirat)
        ENTRY_SAME(mknodat)
@@ -403,5 +396,34 @@
        ENTRY_COMP(move_pages)          /* 295 */
        ENTRY_SAME(getcpu)
        ENTRY_SAME(epoll_pwait)
+       ENTRY_COMP(statfs64)
+       ENTRY_COMP(fstatfs64)
+       ENTRY_COMP(kexec_load)          /* 300 */
+       ENTRY_COMP(utimensat)
+       ENTRY_COMP(signalfd)
+       ENTRY_SAME(ni_syscall)          /* was timerfd */
+       ENTRY_SAME(eventfd)
+       ENTRY_COMP(fallocate)           /* 305 */
+       ENTRY_SAME(timerfd_create)
+       ENTRY_COMP(timerfd_settime)
+       ENTRY_COMP(timerfd_gettime)
+       ENTRY_COMP(signalfd4)
+       ENTRY_SAME(eventfd2)            /* 310 */
+       ENTRY_SAME(epoll_create1)
+       ENTRY_SAME(dup3)
+       ENTRY_SAME(pipe2)
+       ENTRY_SAME(inotify_init1)
+       ENTRY_COMP(preadv)              /* 315 */
+       ENTRY_COMP(pwritev)
+       ENTRY_COMP(rt_tgsigqueueinfo)
+       ENTRY_SAME(perf_event_open)
+       ENTRY_COMP(recvmmsg)
+       ENTRY_SAME(accept4)             /* 320 */
+
        /* Nothing yet */
 
+#undef ENTRY_SAME
+#undef ENTRY_DIFF
+#undef ENTRY_UHOH
+#undef ENTRY_COMP
+#undef ENTRY_OURS