[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1231344265.3770.2.camel@jaswinder.satnam>
Date: Wed, 07 Jan 2009 21:34:25 +0530
From: Jaswinder Singh Rajput <jaswinder@...radead.org>
To: Ingo Molnar <mingo@...e.hu>, LKML <linux-kernel@...r.kernel.org>,
x86 maintainers <x86@...nel.org>
Subject: [PATCH -tip 1/4 V2] x86: smp.h move stack_processor_id declartion
to cpu.h
Impact: cleanup, moving NON-SMP stuff from smp.h
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@...il.com>
---
arch/x86/include/asm/cpu.h | 2 ++
arch/x86/include/asm/smp.h | 1 -
arch/x86/kernel/cpu/common.c | 1 +
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 a151651..cbbea22 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -199,7 +199,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 667e5d5..fb935af 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -22,6 +22,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>
--
1.5.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists