Pull trivial into release branch

[sfrench/cifs-2.6.git] / arch / parisc / kernel / syscall_table.S

diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 51d2480627d1847d32926008df85f6c741ff931f..e27b432f90a8628a5eb2c397d7b1e2ff7f4be8cf 100644 (file)
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -13,7 +13,7 @@
  *    Copyright (C) 2001 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>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -207,7 +207,7 @@
        /* struct sockaddr... */
        ENTRY_SAME(recvfrom)
        /* struct timex contains longs */
-       ENTRY_DIFF(adjtimex)
+       ENTRY_COMP(adjtimex)
        ENTRY_SAME(mprotect)            /* 125 */
        /* old_sigset_t forced to 32 bits.  Beware glibc sigset_t */
        ENTRY_COMP(sigprocmask)
@@ -287,7 +287,7 @@
        ENTRY_SAME(chown)               /* 180 */
        /* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */
        ENTRY_COMP(setsockopt)
-       ENTRY_SAME(getsockopt)
+       ENTRY_COMP(getsockopt)
        ENTRY_COMP(sendmsg)
        ENTRY_COMP(recvmsg)
        ENTRY_SAME(semop)               /* 185 */
@@ -377,15 +377,15 @@
        ENTRY_SAME(inotify_init)
        ENTRY_SAME(inotify_add_watch)   /* 270 */
        ENTRY_SAME(inotify_rm_watch)
-       ENTRY_COMP(pselect6)
-       ENTRY_COMP(ppoll)
+       ENTRY_SAME(ni_syscall)          /* 271 ENTRY_COMP(pselect6) */
+       ENTRY_SAME(ni_syscall)          /* 272 ENTRY_COMP(ppoll) */
        ENTRY_SAME(migrate_pages)
        ENTRY_COMP(openat)              /* 275 */
        ENTRY_SAME(mkdirat)
        ENTRY_SAME(mknodat)
        ENTRY_SAME(fchownat)
        ENTRY_COMP(futimesat)
-       ENTRY_COMP(newfstatat)          /* 280 */
+       ENTRY_SAME(fstatat64)           /* 280 */
        ENTRY_SAME(unlinkat)
        ENTRY_SAME(renameat)
        ENTRY_SAME(linkat)
@@ -393,5 +393,11 @@
        ENTRY_SAME(readlinkat)          /* 285 */
        ENTRY_SAME(fchmodat)
        ENTRY_SAME(faccessat)
+       ENTRY_SAME(unshare)
+       ENTRY_COMP(set_robust_list)
+       ENTRY_COMP(get_robust_list)     /* 290 */
+       ENTRY_SAME(splice)
+       ENTRY_OURS(sync_file_range)
+       ENTRY_SAME(tee)
        /* Nothing yet */