Pull ibm into release branch

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / scall32-o32.S

diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index e7178510220635c5da2be58e59c3b839a36a0bfa..0c9a9ff8cd25ec1c200347206f762f8f09b1ac27 100644 (file)
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -28,18 +28,7 @@
 NESTED(handle_sys, PT_SIZE, sp)
        .set    noat
        SAVE_SOME
-#ifdef CONFIG_TRACE_IRQFLAGS
-       TRACE_IRQS_ON
-#ifdef CONFIG_64BIT
-       LONG_L  $8, PT_R8(sp)
-       LONG_L  $9, PT_R9(sp)
-#endif
-       LONG_L  $7, PT_R7(sp)
-       LONG_L  $6, PT_R6(sp)
-       LONG_L  $5, PT_R5(sp)
-       LONG_L  $4, PT_R4(sp)
-       LONG_L  $2, PT_R2(sp)
-#endif
+       TRACE_IRQS_ON_RELOAD
        STI
        .set    at
 
@@ -663,7 +652,12 @@ einval:    li      v0, -EINVAL
        sys     sys_vmsplice            4
        sys     sys_move_pages          6
        sys     sys_set_robust_list     2
-       sys     sys_get_robust_list     3
+       sys     sys_get_robust_list     3       /* 4310 */
+       sys     sys_kexec_load          4
+       sys     sys_getcpu              3
+       sys     sys_epoll_pwait         6
+       sys     sys_ioprio_set          3
+       sys     sys_ioprio_get          2
        .endm
 
        /* We pre-compute the number of _instruction_ bytes needed to