sparc32: drop hardcoding trap_level in kgdb_trap

[cascardo/linux.git] / arch / sparc / kernel / entry.S

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 51aa6e8..07918ab 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1225,20 +1225,18 @@ breakpoint_trap:
        RESTORE_ALL
 
 #ifdef CONFIG_KGDB
-       .align  4
-       .globl  kgdb_trap_low
-       .type   kgdb_trap_low,#function
-kgdb_trap_low:
+       ENTRY(kgdb_trap_low)
        rd      %wim,%l3
        SAVE_ALL
        wr      %l0, PSR_ET, %psr
        WRITE_PAUSE
 
+       mov     %l7, %o0                ! trap_level
        call    kgdb_trap
-        add    %sp, STACKFRAME_SZ, %o0
+        add    %sp, STACKFRAME_SZ, %o1 ! struct pt_regs *regs
 
        RESTORE_ALL
-       .size   kgdb_trap_low,.-kgdb_trap_low
+       ENDPROC(kgdb_trap_low)
 #endif
 
        .align  4