x86: merge smp_32.h and smp_64.h into smp.h
Merge what's left from smp_32.h and smp_64.h into smp.h
By now, they're basically extern definitions.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 57b3d86..bcbd25c 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -19,6 +19,11 @@
#include <asm/thread_info.h>
extern cpumask_t cpu_callout_map;
+extern cpumask_t cpu_initialized;
+extern cpumask_t cpu_callin_map;
+
+extern void (*mtrr_hook)(void);
+extern void zap_low_mappings(void);
extern int smp_num_siblings;
extern unsigned int num_processors;
@@ -161,12 +166,6 @@
#define stack_smp_processor_id() 0
#endif
-#ifdef CONFIG_X86_32
-# include "smp_32.h"
-#else
-# include "smp_64.h"
-#endif
-
#ifdef CONFIG_X86_LOCAL_APIC
static inline int logical_smp_processor_id(void)