diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-02 10:23:32 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 23:00:39 -0500 |
| commit | 728ee06ca863eb05004aebcaf6f61905f545ef08 (patch) | |
| tree | e45b7d70f49e3fc78f2fd42d57371e8db818c406 | |
| parent | 4cce1a207ce6776ec020353c46ccd924d8656364 (diff) | |
| download | signal-728ee06ca863eb05004aebcaf6f61905f545ef08.tar.gz | |
ppc compat wrappers for add_key(2) and request_key(2) are pointless
all argument validation is done by SYSCALL_DEFINE wrappers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/powerpc/include/asm/systbl.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/kernel/sys_ppc32.c | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index afef04d6ee5294..9db88cd375b83f 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h @@ -273,8 +273,8 @@ COMPAT_SYS(mq_timedreceive) COMPAT_SYS(mq_notify) COMPAT_SYS(mq_getsetattr) COMPAT_SYS(kexec_load) -COMPAT_SYS(add_key) -COMPAT_SYS(request_key) +SYSCALL(add_key) +SYSCALL(request_key) COMPAT_SYS(keyctl) COMPAT_SYS(waitid) SYSCALL(ioprio_set) diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index d78ad7b6c46409..cd6e19d263b32c 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c @@ -117,23 +117,6 @@ long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low, advice); } -asmlinkage long compat_sys_add_key(const char __user *_type, - const char __user *_description, - const void __user *_payload, - u32 plen, - u32 ringid) -{ - return sys_add_key(_type, _description, _payload, plen, ringid); -} - -asmlinkage long compat_sys_request_key(const char __user *_type, - const char __user *_description, - const char __user *_callout_info, - u32 destringid) -{ - return sys_request_key(_type, _description, _callout_info, destringid); -} - asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags, unsigned offset_hi, unsigned offset_lo, unsigned nbytes_hi, unsigned nbytes_lo) |