summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/smp.h
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-27 14:06:00 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:32 +0200
commitb23dab08fa37b302a8980e4cf925f2cb94288538 (patch)
tree1fed61f73d3d1be733e5e2de33acc9cbd8a21c8a /include/asm-x86/smp.h
parentc1fa6c977eb978e1d09867475ec59c9a5799127f (diff)
downloadop-kernel-dev-b23dab08fa37b302a8980e4cf925f2cb94288538.zip
op-kernel-dev-b23dab08fa37b302a8980e4cf925f2cb94288538.tar.gz
x86: merge includes in smp.h
move all include directives from smp_{32,64}.h to smp.h. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
-rw-r--r--include/asm-x86/smp.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index e5534f1..21472ce 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -5,6 +5,19 @@
#include <linux/init.h>
#include <asm/percpu.h>
+/*
+ * We need the APIC definitions automatically as part of 'smp.h'
+ */
+#ifdef CONFIG_X86_LOCAL_APIC
+# include <asm/mpspec.h>
+# include <asm/apic.h>
+# ifdef CONFIG_X86_IO_APIC
+# include <asm/io_apic.h>
+# endif
+#endif
+#include <asm/pda.h>
+#include <asm/thread_info.h>
+
extern cpumask_t cpu_callout_map;
extern int smp_num_siblings;
OpenPOWER on IntegriCloud