6 files changed, 10 insertions, 135 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 007a917a980d..e5f3794744f1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1739,7 +1739,6 @@ config 32BIT
 config 64BIT
         bool "64-bit kernel"
         depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
-        select HAVE_SYSCALL_WRAPPERS
         help
           Select this option if you want to build a 64-bit kernel.
 
diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h
index e9a940d1b0c6..2767dda9e309 100644
--- a/arch/mips/include/asm/linkage.h
+++ b/arch/mips/include/asm/linkage.h
@@ -6,5 +6,8 @@
 #endif
 
 #define __weak __attribute__((weak))
+#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ( #alias " = " #name "\n\t.globl " #alias)
 
 #endif
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index 64f661e32879..63c9c886173a 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -63,12 +63,4 @@
 
 #endif /* !__ASSEMBLY__ */
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
-
 #endif /* _ASM_UNISTD_H */
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index db9655f08892..d1d576b765f5 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -119,99 +119,6 @@ SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,
         return sys_pwrite64(fd, buf, count, merge_64(a4, a5));
 }
 
-#ifdef CONFIG_SYSVIPC
-
-SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third,
-        unsigned long, ptr, unsigned long, fifth)
-{
-        int version, err;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        switch (call) {
-        case SEMOP:
-                /* struct sembuf is the same on 32 and 64bit :)) */
-                err = sys_semtimedop(first, compat_ptr(ptr), second, NULL);
-                break;
-        case SEMTIMEDOP:
-                err = compat_sys_semtimedop(first, compat_ptr(ptr), second,
-                                            compat_ptr(fifth));
-                break;
-        case SEMGET:
-                err = sys_semget(first, second, third);
-                break;
-        case SEMCTL:
-                err = compat_sys_semctl(first, second, third, compat_ptr(ptr));
-                break;
-        case MSGSND:
-                err = compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
-                break;
-        case MSGRCV:
-                err = compat_sys_msgrcv(first, second, fifth, third,
-                                        version, compat_ptr(ptr));
-                break;
-        case MSGGET:
-                err = sys_msgget((key_t) first, second);
-                break;
-        case MSGCTL:
-                err = compat_sys_msgctl(first, second, compat_ptr(ptr));
-                break;
-        case SHMAT:
-                err = compat_sys_shmat(first, second, third, version,
-                                       compat_ptr(ptr));
-                break;
-        case SHMDT:
-                err = sys_shmdt(compat_ptr(ptr));
-                break;
-        case SHMGET:
-                err = sys_shmget(first, (unsigned)second, third);
-                break;
-        case SHMCTL:
-                err = compat_sys_shmctl(first, second, compat_ptr(ptr));
-                break;
-        default:
-                err = -ENOSYS;
-                break;
-        }
-
-        return err;
-}
-
-#else
-
-SYSCALL_DEFINE6(32_ipc, u32, call, int, first, int, second, int, third,
-        u32, ptr, u32, fifth)
-{
-        return -ENOSYS;
-}
-
-#endif /* CONFIG_SYSVIPC */
-
-#ifdef CONFIG_MIPS32_N32
-SYSCALL_DEFINE4(n32_semctl, int, semid, int, semnum, int, cmd, u32, arg)
-{
-        /* compat_sys_semctl expects a pointer to union semun */
-        u32 __user *uptr = compat_alloc_user_space(sizeof(u32));
-        if (put_user(arg, uptr))
-                return -EFAULT;
-        return compat_sys_semctl(semid, semnum, cmd, uptr);
-}
-
-SYSCALL_DEFINE4(n32_msgsnd, int, msqid, u32, msgp, unsigned int, msgsz,
-        int, msgflg)
-{
-        return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));
-}
-
-SYSCALL_DEFINE5(n32_msgrcv, int, msqid, u32, msgp, size_t, msgsz,
-        int, msgtyp, int, msgflg)
-{
-        return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,
-                                 compat_ptr(msgp));
-}
-#endif
-
 SYSCALL_DEFINE1(32_personality, unsigned long, personality)
 {
         unsigned int p = personality & 0xffffffff;
@@ -226,26 +133,6 @@ SYSCALL_DEFINE1(32_personality, unsigned long, personality)
         return ret;
 }
 
-SYSCALL_DEFINE4(32_sendfile, long, out_fd, long, in_fd,
-        compat_off_t __user *, offset, s32, count)
-{
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        off_t of;
-
-        if (offset && get_user(of, offset))
-                return -EFAULT;
-
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, count);
-        set_fs(old_fs);
-
-        if (offset && put_user(of, offset))
-                return -EFAULT;
-
-        return ret;
-}
-
 asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3,
                                    size_t count)
 {
@@ -279,12 +166,6 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
                              merge_64(len_a4, len_a5));
 }
 
-asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf,
-        size_t len)
-{
-        return sys_lookup_dcookie(merge_64(a0, a1), buf, len);
-}
-
 SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
                 u64, a3, u64, a4, int, dfd, const char  __user *, pathname)
 {
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 693d60b0855f..edcb6594e7b5 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -143,7 +143,7 @@ EXPORT(sysn32_call_table)
         PTR     compat_sys_setitimer
         PTR     sys_alarm
         PTR     sys_getpid
-        PTR     sys_32_sendfile
+        PTR     compat_sys_sendfile
         PTR     sys_socket                      /* 6040 */
         PTR     sys_connect
         PTR     sys_accept
@@ -168,11 +168,11 @@ EXPORT(sysn32_call_table)
         PTR     sys_newuname
         PTR     sys_semget
         PTR     sys_semop
-        PTR     sys_n32_semctl
+        PTR     compat_sys_semctl
         PTR     sys_shmdt                       /* 6065 */
         PTR     sys_msgget
-        PTR     sys_n32_msgsnd
-        PTR     sys_n32_msgrcv
+        PTR     compat_sys_msgsnd
+        PTR     compat_sys_msgrcv
         PTR     compat_sys_msgctl
         PTR     compat_sys_fcntl                /* 6070 */
         PTR     sys_flock
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index af8887f779f1..103bfe570fe8 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -309,7 +309,7 @@ sys_call_table:
         PTR     compat_sys_wait4
         PTR     sys_swapoff                     /* 4115 */
         PTR     compat_sys_sysinfo
-        PTR     sys_32_ipc
+        PTR     compat_sys_ipc
         PTR     sys_fsync
         PTR     sys32_sigreturn
         PTR     __sys_clone                     /* 4120 */
@@ -399,7 +399,7 @@ sys_call_table:
         PTR     sys_capget
         PTR     sys_capset                      /* 4205 */
         PTR     compat_sys_sigaltstack
-        PTR     sys_32_sendfile
+        PTR     compat_sys_sendfile
         PTR     sys_ni_syscall
         PTR     sys_ni_syscall
         PTR     sys_mips_mmap2                  /* 4210 */
@@ -439,7 +439,7 @@ sys_call_table:
         PTR     compat_sys_io_submit
         PTR     sys_io_cancel                   /* 4245 */
         PTR     sys_exit_group
-        PTR     sys32_lookup_dcookie
+        PTR     compat_sys_lookup_dcookie
         PTR     sys_epoll_create
         PTR     sys_epoll_ctl
         PTR     sys_epoll_wait                  /* 4250 */