This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index a5b0a38..b8b83bc 100644 (file)
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -19,25 +19,14 @@
 #include <asm/stackframe.h>
 #include <asm/war.h>
 
-#define PANIC_PIC(msg)                                 \
-               .set push;                              \
-               .set    reorder;                        \
-               PTR_LA  a0,8f;                          \
-               .set    noat;                           \
-               PTR_LA  AT, panic;                      \
-               jr      AT;                             \
-9:             b       9b;                             \
-               .set    pop;                            \
-               TEXT(msg)
-
        __INIT
 
 NESTED(except_vec0_generic, 0, sp)
-       PANIC_PIC("Exception vector 0 called")
+       PANIC("Exception vector 0 called")
        END(except_vec0_generic)
 
 NESTED(except_vec1_generic, 0, sp)
-       PANIC_PIC("Exception vector 1 called")
+       PANIC("Exception vector 1 called")
        END(except_vec1_generic)
 
 /*
@@ -153,17 +142,19 @@ NESTED(except_vec_ejtag_debug, 0, sp)
 NESTED(ejtag_debug_handler, PT_SIZE, sp)
        .set    push
        .set    noat
+       .set    noreorder
        MTC0    k0, CP0_DESAVE
        mfc0    k0, CP0_DEBUG
 
        sll     k0, k0, 30      # Check for SDBBP.
        bgez    k0, ejtag_return
+       nop
 
        PTR_LA  k0, ejtag_debug_buffer
        LONG_S  k1, 0(k0)
        SAVE_ALL
-       move    a0, sp
        jal     ejtag_exception_handler
+        move   a0, sp
        RESTORE_ALL
        PTR_LA  k0, ejtag_debug_buffer
        LONG_L  k1, 0(k0)
@@ -172,6 +163,7 @@ ejtag_return:
        MFC0    k0, CP0_DESAVE
        .set    mips32
        deret
+        nop
        .set pop
        END(ejtag_debug_handler)