aboutsummaryrefslogtreecommitdiff
path: root/include
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
parentc1fa6c977eb978e1d09867475ec59c9a5799127f (diff)
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')
-rw-r--r--include/asm-x86/smp.h13
-rw-r--r--include/asm-x86/smp_32.h13
-rw-r--r--include/asm-x86/smp_64.h16
3 files changed, 13 insertions, 29 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index e5534f19c31..21472cea3d6 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;
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 53432dbd542..694d3245a88 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -2,19 +2,6 @@
#define __ASM_SMP_H
#ifndef __ASSEMBLY__
-#include <linux/cpumask.h>
-#include <linux/init.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
extern cpumask_t cpu_callin_map;
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index b83151d7388..eead92e30b2 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -1,22 +1,6 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
-#include <linux/cpumask.h>
-#include <linux/init.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_initialized;
extern cpumask_t cpu_callin_map;