vserver 2.0 rc7

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

diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h
index 8cca555..9c5b1b8 100644 (file)
--- a/include/asm-ppc/unistd.h
+++ b/include/asm-ppc/unistd.h
@@ -276,8 +276,9 @@
 #define __NR_add_key           269
 #define __NR_request_key       270
 #define __NR_keyctl            271
+#define __NR_waitid            272
 
-#define __NR_syscalls          272
+#define __NR_syscalls          273
 
 #define __NR(n)        #n
 
@@ -296,6 +297,7 @@
                register unsigned long __sc_5  __asm__ ("r5");          \
                register unsigned long __sc_6  __asm__ ("r6");          \
                register unsigned long __sc_7  __asm__ ("r7");          \
+               register unsigned long __sc_8  __asm__ ("r8");          \
                                                                        \
                __sc_loadargs_##nr(name, args);                         \
                __asm__ __volatile__                                    \
@@ -304,10 +306,10 @@
                        : "=&r" (__sc_0),                               \
                          "=&r" (__sc_3),  "=&r" (__sc_4),              \
                          "=&r" (__sc_5),  "=&r" (__sc_6),              \
-                         "=&r" (__sc_7)                                \
+                         "=&r" (__sc_7),  "=&r" (__sc_8)               \
                        : __sc_asm_input_##nr                           \
                        : "cr0", "ctr", "memory",                       \
-                         "r8", "r9", "r10","r11", "r12");              \
+                         "r9", "r10","r11", "r12");                    \
                __sc_ret = __sc_3;                                      \
                __sc_err = __sc_0;                                      \
        }                                                               \
@@ -335,6 +337,9 @@
 #define __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5)            \
        __sc_loadargs_4(name, arg1, arg2, arg3, arg4);                  \
        __sc_7 = (unsigned long) (arg5)
+#define __sc_loadargs_6(name, arg1, arg2, arg3, arg4, arg5, arg6)      \
+       __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5);            \
+       __sc_8 = (unsigned long) (arg6)
 
 #define __sc_asm_input_0 "0" (__sc_0)
 #define __sc_asm_input_1 __sc_asm_input_0, "1" (__sc_3)
@@ -342,6 +347,7 @@
 #define __sc_asm_input_3 __sc_asm_input_2, "3" (__sc_5)
 #define __sc_asm_input_4 __sc_asm_input_3, "4" (__sc_6)
 #define __sc_asm_input_5 __sc_asm_input_4, "5" (__sc_7)
+#define __sc_asm_input_6 __sc_asm_input_5, "6" (__sc_8)
 
 #define _syscall0(type,name)                                           \
 type name(void)                                                                \
@@ -379,6 +385,12 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)      \
        __syscall_nr(5, type, name, arg1, arg2, arg3, arg4, arg5);      \
 }
 
+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
+{                                                                      \
+       __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \
+}
+
 #ifdef __KERNEL__
 
 #define __NR__exit __NR_exit
@@ -468,7 +480,7 @@ long sys_rt_sigaction(int sig,
  * but it doesn't work on all toolchains, so we just do it by hand
  */
 #ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
 #endif
 
 #endif /* __KERNEL__ */