* [PATCH -tip 5/7] x86: smp.h move safe_smp_processor_id declartion to cpu.h
@ 2009-01-07 12:44 Jaswinder Singh Rajput
0 siblings, 0 replies; 2+ messages in thread
From: Jaswinder Singh Rajput @ 2009-01-07 12:44 UTC (permalink / raw)
To: Ingo Molnar, James.Bottomley, LKML, x86 maintainers
Impact: cleanup, moving NON-SMP stuff from smp.h
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/x86/include/asm/cpu.h | 1 +
arch/x86/include/asm/smp.h | 1 -
arch/x86/mach-voyager/setup.c | 1 +
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index f958e7e..4c16888 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -15,6 +15,7 @@ extern void prefill_possible_map(void);
static inline void prefill_possible_map(void) {}
+#define safe_smp_processor_id() 0
#define stack_smp_processor_id() 0
#endif /* CONFIG_SMP */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index cbbea22..3a76b19 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -198,7 +198,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
#endif
#ifdef CONFIG_X86_LOCAL_APIC
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index a580b95..0ade625 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -9,6 +9,7 @@
#include <asm/e820.h>
#include <asm/io.h>
#include <asm/setup.h>
+#include <asm/cpu.h>
void __init pre_intr_init_hook(void)
{
--
1.5.6.6
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH -tip 5/7] x86: smp.h move safe_smp_processor_id declartion to cpu.h
@ 2009-01-07 11:57 Jaswinder Singh Rajput
0 siblings, 0 replies; 2+ messages in thread
From: Jaswinder Singh Rajput @ 2009-01-07 11:57 UTC (permalink / raw)
To: Ingo Molnar, James.Bottomley, x86 maintainers, LKML
Impact: cleanup, moving NON-SMP stuff from smp.h
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/x86/include/asm/cpu.h | 1 +
arch/x86/include/asm/smp.h | 1 -
arch/x86/mach-voyager/setup.c | 1 +
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index f958e7e..4c16888 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -15,6 +15,7 @@ extern void prefill_possible_map(void);
static inline void prefill_possible_map(void) {}
+#define safe_smp_processor_id() 0
#define stack_smp_processor_id() 0
#endif /* CONFIG_SMP */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index cbbea22..3a76b19 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -198,7 +198,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
#endif
#ifdef CONFIG_X86_LOCAL_APIC
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index a580b95..0ade625 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -9,6 +9,7 @@
#include <asm/e820.h>
#include <asm/io.h>
#include <asm/setup.h>
+#include <asm/cpu.h>
void __init pre_intr_init_hook(void)
{
--
1.5.6.6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-07 15:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-07 12:44 [PATCH -tip 5/7] x86: smp.h move safe_smp_processor_id declartion to cpu.h Jaswinder Singh Rajput
-- strict thread matches above, loose matches on Subject: below --
2009-01-07 11:57 Jaswinder Singh Rajput
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®