Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core

2008-08-14 14:58:22 +02:00
parent 51ca3c6791 8d7ccaa545 8067794bec a677f58a8c
commit c83d12806b
42 changed files with 192 additions and 20 deletions
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -10,13 +10,15 @@
 #include <asm/e820.h>
 #include <asm/setup.h>

+#include <mach_ipi.h>
+
 #ifdef CONFIG_HOTPLUG_CPU
 #define DEFAULT_SEND_IPI	(1)
 #else
 #define DEFAULT_SEND_IPI	(0)
 #endif

-int no_broadcast=DEFAULT_SEND_IPI;
+int no_broadcast = DEFAULT_SEND_IPI;

 /**
 * pre_intr_init_hook - initialisation prior to setting up interrupt vectors