x86: sys32_kill and sys32_mprotect are pointless

their argument types are identical to those of sys_kill and sys_mprotect
resp., so we are not doing any kind of argument validation, etc. in those -
they turn into unconditional branches to corresponding syscalls.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

3 files changed, 2 insertions, 15 deletions

diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index c0df976b0b71..4e4907c67d92 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -166,12 +166,6 @@ asmlinkage long sys32_mmap(struct mmap_arg_struct32 __user *arg)
                                a.offset>>PAGE_SHIFT);
 }
 
-asmlinkage long sys32_mprotect(unsigned long start, size_t len,
-                               unsigned long prot)
-{
-        return sys_mprotect(start, len, prot);
-}
-
 asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
                               int options)
 {
@@ -198,11 +192,6 @@ asmlinkage long sys32_pwrite(unsigned int fd, const char __user *ubuf,
  * Some system calls that need sign extended arguments. This could be
  * done by a generic wrapper.
  */
-long sys32_kill(int pid, int sig)
-{
-        return sys_kill(pid, sig);
-}
-
 long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high,
                         __u32 len_low, __u32 len_high, int advice)
 {
diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
index df8ad3b3920a..5e1724176626 100644
--- a/arch/x86/include/asm/sys_ia32.h
+++ b/arch/x86/include/asm/sys_ia32.h
@@ -30,7 +30,6 @@ asmlinkage long sys32_fstatat(unsigned int, const char __user *,
                               struct stat64 __user *, int);
 struct mmap_arg_struct32;
 asmlinkage long sys32_mmap(struct mmap_arg_struct32 __user *);
-asmlinkage long sys32_mprotect(unsigned long, size_t, unsigned long);
 
 asmlinkage long sys32_alarm(unsigned int);
 
@@ -42,7 +41,6 @@ asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32);
 
 asmlinkage long sys32_personality(unsigned long);
 
-long sys32_kill(int, int);
 long sys32_fadvise64_64(int, __u32, __u32, __u32, __u32, int);
 long sys32_vm86_warning(void);
 
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index 0f6f5becab0d..d0d59bfbccce 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -43,7 +43,7 @@
 34      i386    nice                    sys_nice
 35      i386    ftime
 36      i386    sync                    sys_sync
-37      i386    kill                    sys_kill                        sys32_kill
+37      i386    kill                    sys_kill
 38      i386    rename                  sys_rename
 39      i386    mkdir                   sys_mkdir
 40      i386    rmdir                   sys_rmdir
@@ -131,7 +131,7 @@
 122     i386    uname                   sys_newuname
 123     i386    modify_ldt              sys_modify_ldt
 124     i386    adjtimex                sys_adjtimex                    compat_sys_adjtimex
-125     i386    mprotect                sys_mprotect                    sys32_mprotect
+125     i386    mprotect                sys_mprotect
 126     i386    sigprocmask             sys_sigprocmask                 compat_sys_sigprocmask
 127     i386    create_module
 128     i386    init_module             sys_init_module