aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/apic.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:36 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:36 -0500
commitae9d983be1eefac4b5efad69a188e7ac89a75797 (patch)
treeecdf7ad736e1fe98dff2277649b573135d1381fd /include/asm-x86/apic.h
parentc2805aa1d8ae51c7582d2ccbd736afa545cf5cc4 (diff)
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>
Diffstat (limited to 'include/asm-x86/apic.h')
-rw-r--r--include/asm-x86/apic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index d0a221fa1fc3..18d932dff476 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -42,6 +42,7 @@ extern int local_apic_timer_disabled;
42 42
43extern int apic_runs_main_timer; 43extern int apic_runs_main_timer;
44extern int ioapic_force; 44extern int ioapic_force;
45extern int disable_apic;
45extern int disable_apic_timer; 46extern int disable_apic_timer;
46extern unsigned boot_cpu_id; 47extern unsigned boot_cpu_id;
47 48