Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  MN10300: gcc 4.6 vs am33 inline assembly
  MN10300: Deprecate gdbstub
  MN10300: Allow KGDB to use the MN10300 serial ports
  MN10300: Emulate single stepping in KGDB on MN10300
  MN10300: Generalise kernel debugger kernel halt, reboot or power off hook
  KGDB: Notify GDB of machine halt, reboot or power off
  MN10300: Use KGDB
  MN10300: Create generic kernel debugger hooks
  MN10300: Create general kernel debugger cache flushing
  MN10300: Introduce a general config option for kernel debugger hooks
  MN10300: The icache invalidate functions should disable the icache first
  MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/mn10300/include/asm/smp.h b/arch/mn10300/include/asm/smp.h
index a3930e43a958..6745dbe64944 100644
--- a/arch/mn10300/include/asm/smp.h
+++ b/arch/mn10300/include/asm/smp.h
@@ -34,7 +34,7 @@
 #define LOCAL_TIMER_IPI         193
 #define FLUSH_CACHE_IPI         194
 #define CALL_FUNCTION_NMI_IPI   195
-#define GDB_NMI_IPI             196
+#define DEBUGGER_NMI_IPI        196
 
 #define SMP_BOOT_IRQ            195
 
@@ -43,6 +43,7 @@
 #define LOCAL_TIMER_GxICR_LV    GxICR_LEVEL_4
 #define FLUSH_CACHE_GxICR_LV    GxICR_LEVEL_0
 #define SMP_BOOT_GxICR_LV       GxICR_LEVEL_0
+#define DEBUGGER_GxICR_LV       CONFIG_DEBUGGER_IRQ_LEVEL
 
 #define TIME_OUT_COUNT_BOOT_IPI 100
 #define DELAY_TIME_BOOT_IPI     75000
@@ -61,8 +62,9 @@
  * An alternate way of dealing with this could be to use the EPSW.S bits to
  * cache this information for systems with up to four CPUs.
  */
+#define arch_smp_processor_id() (CPUID)
 #if 0
-#define raw_smp_processor_id()  (CPUID)
+#define raw_smp_processor_id()  (arch_smp_processor_id())
 #else
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 #endif