include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / mips / kernel / scall32-o32.S

diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index ffa23bd..17202bb 100644 (file)
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -187,89 +187,14 @@ illegal_syscall:
        j       o32_syscall_exit
        END(handle_sys)
 
-       LEAF(mips_atomic_set)
-       andi    v0, a1, 3                       # must be word aligned
-       bnez    v0, bad_alignment
-
-       lw      v1, TI_ADDR_LIMIT($28)          # in legal address range?
-       addiu   a0, a1, 4
-       or      a0, a0, a1
-       and     a0, a0, v1
-       bltz    a0, bad_address
-
-#ifdef CONFIG_CPU_HAS_LLSC
-       /* Ok, this is the ll/sc case.  World is sane :-)  */
-1:     ll      v0, (a1)
-       move    a0, a2
-2:     sc      a0, (a1)
-#if R10000_LLSC_WAR
-       beqzl   a0, 1b
-#else
-       beqz    a0, 1b
-#endif
-
-       .section __ex_table,"a"
-       PTR     1b, bad_stack
-       PTR     2b, bad_stack
-       .previous
-#else
-       sw      a1, 16(sp)
-       sw      a2, 20(sp)
-
-       move    a0, sp
-       move    a2, a1
-       li      a1, 1
-       jal     do_page_fault
-
-       lw      a1, 16(sp)
-       lw      a2, 20(sp)
-
-       /*
-        * At this point the page should be readable and writable unless
-        * there was no more memory available.
-        */
-1:     lw      v0, (a1)
-2:     sw      a2, (a1)
-
-       .section __ex_table,"a"
-       PTR     1b, no_mem
-       PTR     2b, no_mem
-       .previous
-#endif
-
-       sw      zero, PT_R7(sp)         # success
-       sw      v0, PT_R2(sp)           # result
-
-       j       o32_syscall_exit        # continue like a normal syscall
-
-no_mem:        li      v0, -ENOMEM
-       jr      ra
-
-bad_address:
-       li      v0, -EFAULT
-       jr      ra
-
-bad_alignment:
-       li      v0, -EINVAL
-       jr      ra
-       END(mips_atomic_set)
-
-       LEAF(sys_sysmips)
-       beq     a0, MIPS_ATOMIC_SET, mips_atomic_set
-       j       _sys_sysmips
-       END(sys_sysmips)
-
        LEAF(sys_syscall)
        subu    t0, a0, __NR_O32_Linux  # check syscall number
        sltiu   v0, t0, __NR_O32_Linux_syscalls + 1
+       beqz    t0, einval              # do not recurse
        sll     t1, t0, 3
        beqz    v0, einval
-
        lw      t2, sys_call_table(t1)          # syscall routine
 
-       li      v1, 4000 - __NR_O32_Linux       # index of sys_syscall
-       beq     t0, v1, einval                  # do not recurse
-
        /* Some syscalls like execve get their arguments from struct pt_regs
           and claim zero arguments in the syscall table. Thus we have to
           assume the worst case and shuffle around all potential arguments.
@@ -293,7 +218,7 @@ bad_alignment:
        jr      t2
        /* Unreached */
 
-einval:        li      v0, -EINVAL
+einval:        li      v0, -ENOSYS
        jr      ra
        END(sys_syscall)
 
@@ -401,8 +326,8 @@ einval:     li      v0, -EINVAL
        sys     sys_uselib              1
        sys     sys_swapon              2
        sys     sys_reboot              3
-       sys     old_readdir             3
-       sys     old_mmap                6       /* 4090 */
+       sys     sys_old_readdir         3
+       sys     sys_mips_mmap           6       /* 4090 */
        sys     sys_munmap              2
        sys     sys_truncate            2
        sys     sys_ftruncate           2
@@ -522,7 +447,7 @@ einval:     li      v0, -EINVAL
        sys     sys_sendfile            4
        sys     sys_ni_syscall          0
        sys     sys_ni_syscall          0
-       sys     sys_mmap2               6       /* 4210 */
+       sys     sys_mips_mmap2          6       /* 4210 */
        sys     sys_truncate64          4
        sys     sys_ftruncate64         4
        sys     sys_stat64              2
@@ -627,7 +552,7 @@ einval:     li      v0, -EINVAL
        sys     sys_pselect6            6
        sys     sys_ppoll               5
        sys     sys_unshare             1
-       sys     sys_splice              4
+       sys     sys_splice              6
        sys     sys_sync_file_range     7       /* 4305 */
        sys     sys_tee                 4
        sys     sys_vmsplice            4
@@ -653,6 +578,12 @@ einval:    li      v0, -EINVAL
        sys     sys_dup3                3
        sys     sys_pipe2               2
        sys     sys_inotify_init1       1
+       sys     sys_preadv              6       /* 4330 */
+       sys     sys_pwritev             6
+       sys     sys_rt_tgsigqueueinfo   4
+       sys     sys_perf_event_open     5
+       sys     sys_accept4             4
+       sys     sys_recvmmsg            5
        .endm
 
        /* We pre-compute the number of _instruction_ bytes needed to