Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-3.10.git] / arch / mips / kernel / scall64-n32.S

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 6de1f598346e3bfd527f1d3cad321160aedb3c02..693d60b0855fad227de008303d67fc332983fc00 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -17,18 +17,12 @@
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
 
-/* This duplicates the definition from <linux/sched.h> */
-#define PT_TRACESYS    0x00000002      /* tracing system calls */
-
-/* This duplicates the definition from <asm/signal.h> */
-#define SIGILL         4               /* Illegal instruction (ANSI).  */
-
 #ifndef CONFIG_MIPS32_O32
 /* No O32, so define handle_sys here */
 #define handle_sysn32 handle_sys
 #endif
 
-       .align  5
+       .align  5
 NESTED(handle_sysn32, PT_SIZE, sp)
 #ifndef CONFIG_MIPS32_O32
        .set    noat
@@ -39,7 +33,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
 #endif
 
        dsubu   t0, v0, __NR_N32_Linux  # check syscall number
-       sltiu   t0, t0, __NR_N32_Linux_syscalls + 1
+       sltiu   t0, t0, __NR_N32_Linux_syscalls + 1
 
 #ifndef CONFIG_MIPS32_O32
        ld      t1, PT_EPC(sp)          # skip syscall on return
@@ -70,18 +64,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
        sd      t1, PT_R0(sp)           # save it for syscall restarting
 1:     sd      v0, PT_R2(sp)           # result
 
-       local_irq_disable               # make sure need_resched and
-                                       # signals dont change between
-                                       # sampling and return
-       LONG_L  a2, TI_FLAGS($28)       # current->work
-       li      t0, _TIF_ALLWORK_MASK
-       and     t0, a2, t0
-       bnez    t0, n32_syscall_exit_work
-
-       j       restore_partial
-
-n32_syscall_exit_work:
-       j       syscall_exit_work_partial
+       j       syscall_exit_partial
 
 /* ------------------------------------------------------------------------ */
 
@@ -134,8 +117,8 @@ EXPORT(sysn32_call_table)
        PTR     sys_mprotect                    /* 6010 */
        PTR     sys_munmap
        PTR     sys_brk
-       PTR     sys_32_rt_sigaction
-       PTR     sys_32_rt_sigprocmask
+       PTR     compat_sys_rt_sigaction
+       PTR     compat_sys_rt_sigprocmask
        PTR     compat_sys_ioctl                /* 6015 */
        PTR     sys_pread64
        PTR     sys_pwrite64
@@ -176,9 +159,9 @@ EXPORT(sysn32_call_table)
        PTR     sys_socketpair
        PTR     compat_sys_setsockopt
        PTR     sys_getsockopt
-       PTR     sys_clone                       /* 6055 */
-       PTR     sys_fork
-       PTR     sys32_execve
+       PTR     __sys_clone                     /* 6055 */
+       PTR     __sys_fork
+       PTR     compat_sys_execve
        PTR     sys_exit
        PTR     compat_sys_wait4
        PTR     sys_kill                        /* 6060 */
@@ -246,11 +229,11 @@ EXPORT(sysn32_call_table)
        PTR     sys_getsid
        PTR     sys_capget
        PTR     sys_capset
-       PTR     sys_32_rt_sigpending            /* 6125 */
+       PTR     compat_sys_rt_sigpending        /* 6125 */
        PTR     compat_sys_rt_sigtimedwait
-       PTR     sys_32_rt_sigqueueinfo
-       PTR     sysn32_rt_sigsuspend
-       PTR     sys32_sigaltstack
+       PTR     compat_sys_rt_sigqueueinfo
+       PTR     compat_sys_rt_sigsuspend
+       PTR     compat_sys_sigaltstack
        PTR     compat_sys_utime                /* 6130 */
        PTR     sys_mknod
        PTR     sys_32_personality
@@ -266,7 +249,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_sched_getscheduler
        PTR     sys_sched_get_priority_max
        PTR     sys_sched_get_priority_min
-       PTR     sys_32_sched_rr_get_interval    /* 6145 */
+       PTR     compat_sys_sched_rr_get_interval        /* 6145 */
        PTR     sys_mlock
        PTR     sys_munlock
        PTR     sys_mlockall
@@ -296,7 +279,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_quotactl
        PTR     sys_ni_syscall                  /* was nfsservctl */
        PTR     sys_ni_syscall                  /* res. for getpmsg */
-       PTR     sys_ni_syscall                  /* 6175  for putpmsg */
+       PTR     sys_ni_syscall                  /* 6175  for putpmsg */
        PTR     sys_ni_syscall                  /* res. for afs_syscall */
        PTR     sys_ni_syscall                  /* res. for security */
        PTR     sys_gettid
@@ -315,7 +298,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_fremovexattr
        PTR     sys_tkill
        PTR     sys_ni_syscall
-       PTR     sys_32_futex
+       PTR     compat_sys_futex
        PTR     compat_sys_sched_setaffinity    /* 6195 */
        PTR     compat_sys_sched_getaffinity
        PTR     sys_cacheflush
@@ -408,19 +391,19 @@ EXPORT(sysn32_call_table)
        PTR     sys_timerfd_create
        PTR     compat_sys_timerfd_gettime      /* 6285 */
        PTR     compat_sys_timerfd_settime
-       PTR     sys_signalfd4
+       PTR     compat_sys_signalfd4
        PTR     sys_eventfd2
        PTR     sys_epoll_create1
        PTR     sys_dup3                        /* 6290 */
        PTR     sys_pipe2
        PTR     sys_inotify_init1
-       PTR     sys_preadv
-       PTR     sys_pwritev
+       PTR     compat_sys_preadv
+       PTR     compat_sys_pwritev
        PTR     compat_sys_rt_tgsigqueueinfo    /* 6295 */
        PTR     sys_perf_event_open
        PTR     sys_accept4
-       PTR     compat_sys_recvmmsg
-       PTR     sys_getdents64
+       PTR     compat_sys_recvmmsg
+       PTR     sys_getdents64
        PTR     sys_fanotify_init               /* 6300 */
        PTR     sys_fanotify_mark
        PTR     sys_prlimit64
@@ -430,4 +413,8 @@ EXPORT(sysn32_call_table)
        PTR     sys_syncfs
        PTR     compat_sys_sendmmsg
        PTR     sys_setns
+       PTR     compat_sys_process_vm_readv
+       PTR     compat_sys_process_vm_writev    /* 6310 */
+       PTR     sys_kcmp
+       PTR     sys_finit_module
        .size   sysn32_call_table,.-sysn32_call_table