commit ae9d983be1eefac4b5efad69a188e7ac89a75797
author Thomas Gleixner <tglx@linutronix.de> Wed Jan 30 13:30:36 2008 +0100
committer Ingo Molnar <mingo@elte.hu> Wed Jan 30 13:30:36 2008 +0100
tree ecdf7ad736e1fe98dff2277649b573135d1381fd
parent c2805aa1d8ae51c7582d2ccbd736afa545cf5cc4

x86: cleanup smp.h variants

Bring the smp.h variants into sync to prepare merging and
paravirt support.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

include/asm-x86/apic.h

diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index d0a221f..18d932d 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -42,6 +42,7 @@
 
 extern int apic_runs_main_timer;
 extern int ioapic_force;
+extern int disable_apic;
 extern int disable_apic_timer;
 extern unsigned boot_cpu_id;