Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into...

[cascardo/linux.git] / arch / sh / kernel / debugtraps.S

diff --git a/arch/sh/kernel/debugtraps.S b/arch/sh/kernel/debugtraps.S
index 13b6674..5917413 100644 (file)
--- a/arch/sh/kernel/debugtraps.S
+++ b/arch/sh/kernel/debugtraps.S
@@ -3,7 +3,7 @@
  *
  * Debug trap jump tables for SuperH
  *
- *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2006 - 2008  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -12,12 +12,13 @@
 #include <linux/sys.h>
 #include <linux/linkage.h>
 
-#if !defined(CONFIG_SH_KGDB)
-#define kgdb_handle_exception  debug_trap_handler
+#if !defined(CONFIG_KGDB)
+#define breakpoint_trap_handler                debug_trap_handler
+#define singlestep_trap_handler                debug_trap_handler
 #endif
 
 #if !defined(CONFIG_SH_STANDARD_BIOS)
-#define sh_bios_handler                debug_trap_handler
+#define sh_bios_handler                        debug_trap_handler
 #endif
 
        .data
@@ -35,7 +36,7 @@ ENTRY(debug_trap_table)
        .long debug_trap_handler        /* 0x39 */
        .long debug_trap_handler        /* 0x3a */
        .long debug_trap_handler        /* 0x3b */
-       .long kgdb_handle_exception     /* 0x3c */
-       .long debug_trap_handler        /* 0x3d */
+       .long breakpoint_trap_handler   /* 0x3c */
+       .long singlestep_trap_handler   /* 0x3d */
        .long bug_trap_handler          /* 0x3e */
        .long sh_bios_handler           /* 0x3f */