4 files changed, 11 insertions, 15 deletions

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 51aa6e86a5f8..07918ab3062e 100644
--- 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
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index 5057ec2e4af6..c9804551262c 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -127,6 +127,7 @@ extern unsigned int t_nmi[];
 extern unsigned int linux_trap_ipi15_sun4d[];
 extern unsigned int linux_trap_ipi15_sun4m[];
 
+extern struct tt_entry trapbase;
 extern struct tt_entry trapbase_cpu1;
 extern struct tt_entry trapbase_cpu2;
 extern struct tt_entry trapbase_cpu3;
diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c
index dcf210811af4..6e8e318c57be 100644
--- a/arch/sparc/kernel/kgdb_32.c
+++ b/arch/sparc/kernel/kgdb_32.c
@@ -12,7 +12,8 @@
 #include <asm/irq.h>
 #include <asm/cacheflush.h>
 
-extern unsigned long trapbase;
+#include "kernel.h"
+#include "entry.h"
 
 void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 {
@@ -133,21 +134,19 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
         return -1;
 }
 
-extern void do_hw_interrupt(struct pt_regs *regs, unsigned long type);
-
-asmlinkage void kgdb_trap(struct pt_regs *regs)
+asmlinkage void kgdb_trap(unsigned long trap_level, struct pt_regs *regs)
 {
         unsigned long flags;
 
         if (user_mode(regs)) {
-                do_hw_interrupt(regs, 0xfd);
+                do_hw_interrupt(regs, trap_level);
                 return;
         }
 
         flushw_all();
 
         local_irq_save(flags);
-        kgdb_handle_exception(0x172, SIGTRAP, 0, regs);
+        kgdb_handle_exception(trap_level, SIGTRAP, 0, regs);
         local_irq_restore(flags);
 }
 
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 69d75ff1c25c..c4e65cb3280f 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -68,8 +68,6 @@ struct screen_info screen_info = {
  * prints out pretty messages and returns.
  */
 
-extern unsigned long trapbase;
-
 /* Pretty sick eh? */
 static void prom_sync_me(void)
 {
@@ -300,7 +298,7 @@ void __init setup_arch(char **cmdline_p)
         int i;
         unsigned long highest_paddr;
 
-        sparc_ttable = (struct tt_entry *) &trapbase;
+        sparc_ttable = &trapbase;
 
         /* Initialize PROM console and command line. */
         *cmdline_p = prom_getbootargs();