Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / scall64-64.S

diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 4c22d0b4825dc70bcdfb5d239dc458d60d6c185c..3a34f62c8b1b3152b9fb3ac68911a47484eb3743 100644 (file)
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -34,7 +34,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
         */
        .set    noat
        SAVE_SOME
-       TRACE_IRQS_ON
+       TRACE_IRQS_ON_RELOAD
        STI
        .set    at
 #endif
@@ -468,3 +468,4 @@ sys_call_table:
        PTR     sys_move_pages
        PTR     sys_set_robust_list
        PTR     sys_get_robust_list
+       PTR     sys_ni_syscall                  /* 5270 */