[PATCH] x86_64: Add new key syscalls.

Add new key syscalls.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 4210fa0e6918d7856511100a2c9065bd9c7da1c3..270f8ca873ae06f37ca98752a80d59c527f48f5a 100644 (file)
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -587,6 +587,10 @@ ia32_sys_call_table:
        .quad compat_sys_mq_getsetattr
        .quad quiet_ni_syscall          /* reserved for kexec */
        .quad sys32_waitid
+       .quad quiet_ni_syscall          /* sys_altroot */
+       .quad sys_add_key
+       .quad sys_request_key
+       .quad sys_keyctl
        /* don't forget to change IA32_NR_syscalls */
 ia32_syscall_end:              
        .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8

diff --git a/include/asm-x86_64/ia32_unistd.h b/include/asm-x86_64/ia32_unistd.h
index 26e56c27fe186bd284f79ac6fb8ecd3af0786af2..f3b7111cf33da9278c8c29deb3974a9ce7a6da89 100644 (file)
--- a/include/asm-x86_64/ia32_unistd.h
+++ b/include/asm-x86_64/ia32_unistd.h
@@ -290,7 +290,11 @@
 #define __NR_ia32_mq_getsetattr        (__NR_ia32_mq_open+5)
 #define __NR_ia32_kexec                283
 #define __NR_ia32_waitid               284
+/* #define __NR_sys_setaltroot 285 */
+#define __NR_ia32_add_key              286
+#define __NR_ia32_request_key  287
+#define __NR_ia32_keyctl               288
 
-#define IA32_NR_syscalls 285   /* must be > than biggest syscall! */
+#define IA32_NR_syscalls 290   /* must be > than biggest syscall! */
 
 #endif /* _ASM_X86_64_IA32_UNISTD_H_ */

diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index f1a510a9b195b1bdc34f2e403868bbbbd9c2f7be..d9182e600b697583ccba02512afdc697697181b2 100644 (file)
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -556,8 +556,14 @@ __SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)
 __SYSCALL(__NR_kexec_load, sys_ni_syscall)
 #define __NR_waitid            247
 __SYSCALL(__NR_waitid, sys_waitid)
-
-#define __NR_syscall_max __NR_waitid
+#define __NR_add_key           248
+__SYSCALL(__NR_add_key, sys_add_key)
+#define __NR_request_key       249
+__SYSCALL(__NR_request_key, sys_request_key)
+#define __NR_keyctl            250
+__SYSCALL(__NR_keyctl, sys_keyctl)
+
+#define __NR_syscall_max __NR_keyctl
 #ifndef __NO_STUBS
 
 /* user-visible error numbers are in the range -1 - -4095 */