linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-x86_64 / unistd.h

diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index 43904f4..732a094 100644 (file)
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -425,15 +425,7 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall)
 __SYSCALL(__NR_afs_syscall, sys_ni_syscall)
 
 #define __NR_tuxcall                   184 /* reserved for tux */
-#ifdef CONFIG_TUX
- __SYSCALL(__NR_tuxcall, __sys_tux)
-#else
-# ifdef CONFIG_TUX_MODULE
-  __SYSCALL(__NR_tuxcall, sys_tux)
-# else
-  __SYSCALL(__NR_tuxcall, sys_ni_syscall)
-# endif
-#endif
+__SYSCALL(__NR_tuxcall, sys_ni_syscall)
 
 #define __NR_security                  185
 __SYSCALL(__NR_security, sys_ni_syscall)
@@ -608,29 +600,13 @@ __SYSCALL(__NR_fchmodat, sys_fchmodat)
 #define __NR_faccessat         269
 __SYSCALL(__NR_faccessat, sys_faccessat)
 #define __NR_pselect6          270
-__SYSCALL(__NR_pselect6, sys_pselect6)
+__SYSCALL(__NR_pselect6, sys_ni_syscall)       /* for now */
 #define __NR_ppoll             271
-__SYSCALL(__NR_ppoll,  sys_ppoll)
+__SYSCALL(__NR_ppoll,  sys_ni_syscall)         /* for now */
 #define __NR_unshare           272
 __SYSCALL(__NR_unshare,        sys_unshare)
-#define __NR_set_robust_list   273
-__SYSCALL(__NR_set_robust_list, sys_set_robust_list)
-#define __NR_get_robust_list   274
-__SYSCALL(__NR_get_robust_list, sys_get_robust_list)
-#define __NR_splice            275
-__SYSCALL(__NR_splice, sys_splice)
-#define __NR_tee               276
-__SYSCALL(__NR_tee, sys_tee)
-#define __NR_sync_file_range   277
-__SYSCALL(__NR_sync_file_range, sys_sync_file_range)
-#define __NR_vmsplice          278
-__SYSCALL(__NR_vmsplice, sys_vmsplice)
-#define __NR_move_pages                279
-__SYSCALL(__NR_move_pages, sys_move_pages)
-
-#ifdef __KERNEL__
 
-#define __NR_syscall_max __NR_move_pages
+#define __NR_syscall_max __NR_unshare
 
 #ifndef __NO_STUBS
 
@@ -647,6 +623,7 @@ do { \
        return (type) (res); \
 } while (0)
 
+#ifdef __KERNEL__
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_OLD_STAT
 #define __ARCH_WANT_SYS_ALARM
@@ -666,9 +643,9 @@ do { \
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
-#define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_TIME
 #define __ARCH_WANT_COMPAT_SYS_TIME
+#endif
 
 #ifndef __KERNEL_SYSCALLS__
 
@@ -830,7 +807,9 @@ asmlinkage long sys_fork(struct pt_regs regs);
 asmlinkage long sys_vfork(struct pt_regs regs);
 asmlinkage long sys_pipe(int *fildes);
 
-#ifndef __ASSEMBLY__
+#endif /* __KERNEL_SYSCALLS__ */
+
+#if !defined(__ASSEMBLY__) && defined(__KERNEL__)
 
 #include <linux/linkage.h>
 #include <linux/compiler.h>
@@ -845,9 +824,9 @@ asmlinkage long sys_rt_sigaction(int sig,
                                struct sigaction __user *oact,
                                size_t sigsetsize);
 
-#endif  /* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
 
-#endif /* __KERNEL_SYSCALLS__ */
+#endif /* __NO_STUBS */
 
 /*
  * "Conditional" syscalls
@@ -857,8 +836,4 @@ asmlinkage long sys_rt_sigaction(int sig,
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
 
-#endif /* __NO_STUBS */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_X86_64_UNISTD_H_ */
+#endif