Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / mips / kernel / scall64-o32.S

diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index cf3e75e..af8887f 100644 (file)
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -10,7 +10,7 @@
  *
  * Hairy, the userspace application uses a different argument passing
  * convention than the kernel, so we have to translate things from o32
- * to ABI64 calling convention.  64-bit syscalls are also processed
+ * to ABI64 calling convention.         64-bit syscalls are also processed
  * here for now.
  */
 #include <linux/errno.h>
@@ -24,7 +24,7 @@
 #include <asm/unistd.h>
 #include <asm/sysmips.h>
 
-       .align  5
+       .align  5
 NESTED(handle_sys, PT_SIZE, sp)
        .set    noat
        SAVE_SOME
@@ -185,7 +185,7 @@ LEAF(sys32_syscall)
        jr      t2
        /* Unreached */
 
-einval:        li      v0, -ENOSYS
+einval: li     v0, -ENOSYS
        jr      ra
        END(sys32_syscall)
 
@@ -194,7 +194,7 @@ einval:     li      v0, -ENOSYS
 sys_call_table:
        PTR     sys32_syscall                   /* 4000 */
        PTR     sys_exit
-       PTR     sys_fork
+       PTR     __sys_fork
        PTR     sys_read
        PTR     sys_write
        PTR     compat_sys_open                 /* 4005 */
@@ -284,8 +284,8 @@ sys_call_table:
        PTR     compat_sys_old_readdir
        PTR     sys_mips_mmap                   /* 4090 */
        PTR     sys_munmap
-       PTR     sys_truncate
-       PTR     sys_ftruncate
+       PTR     compat_sys_truncate
+       PTR     compat_sys_ftruncate
        PTR     sys_fchmod
        PTR     sys_fchown                      /* 4095 */
        PTR     sys_getpriority
@@ -312,7 +312,7 @@ sys_call_table:
        PTR     sys_32_ipc
        PTR     sys_fsync
        PTR     sys32_sigreturn
-       PTR     sys32_clone                     /* 4120 */
+       PTR     __sys_clone                     /* 4120 */
        PTR     sys_setdomainname
        PTR     sys_newuname
        PTR     sys_ni_syscall                  /* sys_modify_ldt */
@@ -329,7 +329,7 @@ sys_call_table:
        PTR     sys_bdflush
        PTR     sys_sysfs                       /* 4135 */
        PTR     sys_32_personality
-       PTR     sys_ni_syscall                  /* for afs_syscall */
+       PTR     sys_ni_syscall                  /* for afs_syscall */
        PTR     sys_setfsuid
        PTR     sys_setfsgid
        PTR     sys_32_llseek                   /* 4140 */
@@ -352,12 +352,12 @@ sys_call_table:
        PTR     sys_munlockall
        PTR     sys_sched_setparam
        PTR     sys_sched_getparam
-       PTR     sys_sched_setscheduler          /* 4160 */
+       PTR     sys_sched_setscheduler          /* 4160 */
        PTR     sys_sched_getscheduler
        PTR     sys_sched_yield
        PTR     sys_sched_get_priority_max
        PTR     sys_sched_get_priority_min
-       PTR     sys_32_sched_rr_get_interval    /* 4165 */
+       PTR     compat_sys_sched_rr_get_interval        /* 4165 */
        PTR     compat_sys_nanosleep
        PTR     sys_mremap
        PTR     sys_accept
@@ -386,19 +386,19 @@ sys_call_table:
        PTR     sys_getresgid
        PTR     sys_prctl
        PTR     sys32_rt_sigreturn
-       PTR     sys_32_rt_sigaction
-       PTR     sys_32_rt_sigprocmask           /* 4195 */
-       PTR     sys_32_rt_sigpending
+       PTR     compat_sys_rt_sigaction
+       PTR     compat_sys_rt_sigprocmask       /* 4195 */
+       PTR     compat_sys_rt_sigpending
        PTR     compat_sys_rt_sigtimedwait
-       PTR     sys_32_rt_sigqueueinfo
-       PTR     sys32_rt_sigsuspend
+       PTR     compat_sys_rt_sigqueueinfo
+       PTR     compat_sys_rt_sigsuspend
        PTR     sys_32_pread                    /* 4200 */
        PTR     sys_32_pwrite
        PTR     sys_chown
        PTR     sys_getcwd
        PTR     sys_capget
        PTR     sys_capset                      /* 4205 */
-       PTR     sys32_sigaltstack
+       PTR     compat_sys_sigaltstack
        PTR     sys_32_sendfile
        PTR     sys_ni_syscall
        PTR     sys_ni_syscall
@@ -430,7 +430,7 @@ sys_call_table:
        PTR     sys_fremovexattr                /* 4235 */
        PTR     sys_tkill
        PTR     sys_sendfile64
-       PTR     sys_32_futex
+       PTR     compat_sys_futex
        PTR     compat_sys_sched_setaffinity
        PTR     compat_sys_sched_getaffinity    /* 4240 */
        PTR     compat_sys_io_setup
@@ -470,7 +470,7 @@ sys_call_table:
        PTR     compat_sys_mq_notify            /* 4275 */
        PTR     compat_sys_mq_getsetattr
        PTR     sys_ni_syscall                  /* sys_vserver */
-       PTR     sys_32_waitid
+       PTR     compat_sys_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key                     /* 4280 */
        PTR     sys_request_key