sh: nmi_debug support.

[linux-block.git] / arch / sh / kernel / cpu / sh3 / ex.S

diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S
index dac42972689932b00100fd1c3a654a26aa61d1e9..46610c35c232e8f5d051a485dfff69ff214bb1bc 100644 (file)
--- a/arch/sh/kernel/cpu/sh3/ex.S
+++ b/arch/sh/kernel/cpu/sh3/ex.S
@@ -26,7 +26,7 @@
 #define        fpu_error_trap_handler          exception_error
 #endif
 
-#if !defined(CONFIG_KGDB_NMI)
+#if !defined(CONFIG_KGDB)
 #define kgdb_handle_exception          exception_error
 #endif
 
@@ -48,9 +48,7 @@ ENTRY(exception_handling_table)
        .long   system_call     ! Unconditional Trap     /* 160 */
        .long   exception_error ! reserved_instruction (filled by trap_init) /* 180 */
        .long   exception_error ! illegal_slot_instruction (filled by trap_init) /*1A0*/
-ENTRY(nmi_slot)
-       .long   kgdb_handle_exception   /* 1C0 */       ! Allow trap to debugger
-ENTRY(user_break_point_trap)
+       .long   nmi_trap_handler        /* 1C0 */       ! Allow trap to debugger
        .long   break_point_trap        /* 1E0 */
 
        /*