Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[pandora-kernel.git] / arch / mn10300 / include / asm / smp.h

diff --git a/arch/mn10300/include/asm/smp.h b/arch/mn10300/include/asm/smp.h
index a3930e4..6745dbe 100644 (file)
--- 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