[PATCH] Remove syscall declarations from linux/key.h

David Howells
2004-09-08T09:31:24Z

The attached patch removes the syscall declarations from linux/key.h as
they're not really necessary - only entry.S should be calling them.

Signed-Off-By: David Howells <dhowells@redhat.com>
---

key.h | 17 -----------------
1 files changed, 17 deletions(-)

diff -c /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h.orig /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h
--- /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h.orig 2004-09-08 10:15:43.472375403 +0100
+++ /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h 2004-09-08 10:15:56.636285384 +0100
@@ -251,20 +251,6 @@
extern void key_fsuid_changed(struct task_struct *tsk);
extern void key_fsgid_changed(struct task_struct *tsk);

-asmlinkage long sys_add_key(const char __user *_type,
- const char __user *_description,
- const void __user *_payload,
- size_t plen,
- key_serial_t destringid);
-
-asmlinkage long sys_request_key(const char __user *_type,
- const char __user *_description,
- const char __user *_callout_info,
- key_serial_t destringid);
-
-asmlinkage long sys_keyctl(int cmd, unsigned long arg2, unsigned long arg3,
- unsigned long arg4, unsigned long arg5);
-
#else /* CONFIG_KEYS */

#define key_put(k) do { } while(0)
@@ -276,9 +262,6 @@
#define exec_keys(t) do { } while(0)
#define key_fsuid_changed(t) do { } while(0)
#define key_fsgid_changed(t) do { } while(0)
-#define sys_addkey(a,b,c,d,e) (-ENOSYS)
-#define sys_request_key(a,b,c,d,e) (-ENOSYS)
-#define sys_keyctl(a,b,c,d,e) (-ENOSYS)

#endif /* CONFIG_KEYS */
#endif /* __KERNEL__ */