Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / mips / kernel / entry.S

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 766655f..a9c6de1 100644 (file)
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -7,6 +7,7 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  * Copyright (C) 2001 MIPS Technologies, Inc.
  */
+#include <linux/config.h>
 
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
@@ -65,7 +66,7 @@ need_resched:
 #endif
 
 FEXPORT(ret_from_fork)
-       jal     schedule_tail           # a0 = struct task_struct *prev
+       jal     schedule_tail           # a0 = task_t *prev
 
 FEXPORT(syscall_exit)
        local_irq_disable               # make sure need_resched and
@@ -86,7 +87,7 @@ FEXPORT(restore_all)                  # restore full frame
        ori     v1, v0, TCSTATUS_IXMT
        mtc0    v1, CP0_TCSTATUS
        andi    v0, TCSTATUS_IXMT
-       _ehb
+       ehb
        mfc0    t0, CP0_TCCONTEXT
        DMT     9                               # dmt t1
        jal     mips_ihb
@@ -94,7 +95,7 @@ FEXPORT(restore_all)                  # restore full frame
        andi    t3, t0, 0xff00
        or      t2, t2, t3
        mtc0    t2, CP0_STATUS
-       _ehb
+       ehb
        andi    t1, t1, VPECONTROL_TE
        beqz    t1, 1f
        EMT
@@ -104,7 +105,7 @@ FEXPORT(restore_all)                        # restore full frame
        xori    v1, v1, TCSTATUS_IXMT
        or      v1, v0, v1
        mtc0    v1, CP0_TCSTATUS
-       _ehb
+       ehb
        xor     t0, t0, t3
        mtc0    t0, CP0_TCCONTEXT
 #endif /* CONFIG_MIPS_MT_SMTC */
@@ -113,21 +114,6 @@ FEXPORT(restore_all)                       # restore full frame
        RESTORE_AT
        RESTORE_STATIC
 FEXPORT(restore_partial)               # restore partial frame
-#ifdef CONFIG_TRACE_IRQFLAGS
-       SAVE_STATIC
-       SAVE_AT
-       SAVE_TEMP
-       LONG_L  v0, PT_STATUS(sp)
-       and     v0, 1
-       beqz    v0, 1f
-       jal     trace_hardirqs_on
-       b       2f
-1:     jal     trace_hardirqs_off
-2:
-       RESTORE_TEMP
-       RESTORE_AT
-       RESTORE_STATIC
-#endif
        RESTORE_SOME
        RESTORE_SP_AND_RET
        .set    at