aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@infradead.org>2009-01-07 21:34:25 +0530
committerIngo Molnar <mingo@elte.hu>2009-01-07 21:48:25 +0100
commitf472cdba849cc3d838f3788469316e8572463a8c (patch)
treec6602bdddafd70580f6f13e3714c0c0cda39d931
parent6e5385d44b2df05e50a8d07ba0e14d3e32685237 (diff)
downloadkernel_samsung_smdk4412-f472cdba849cc3d838f3788469316e8572463a8c.zip
kernel_samsung_smdk4412-f472cdba849cc3d838f3788469316e8572463a8c.tar.gz
kernel_samsung_smdk4412-f472cdba849cc3d838f3788469316e8572463a8c.tar.bz2
x86: smp.h move stack_processor_id declartion to cpu.h
Impact: cleanup Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/include/asm/cpu.h2
-rw-r--r--arch/x86/include/asm/smp.h1
-rw-r--r--arch/x86/kernel/cpu/common.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 29aa6d0..f958e7e 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -15,6 +15,8 @@ extern void prefill_possible_map(void);
static inline void prefill_possible_map(void) {}
+#define stack_smp_processor_id() 0
+
#endif /* CONFIG_SMP */
struct x86_cpu {
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 62bd3f6..ed4af9a 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -173,7 +173,6 @@ extern int safe_smp_processor_id(void);
#else /* !CONFIG_X86_32_SMP && !CONFIG_X86_64_SMP */
#define cpu_physical_id(cpu) boot_cpu_physical_apicid
#define safe_smp_processor_id() 0
-#define stack_smp_processor_id() 0
#endif
#ifdef CONFIG_X86_LOCAL_APIC
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 3f95a40..f7619a2 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -21,6 +21,7 @@
#include <asm/asm.h>
#include <asm/numa.h>
#include <asm/smp.h>
+#include <asm/cpu.h>
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/mpspec.h>
#include <asm/apic.h>