LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] x86: use CONFIG_X86_SMP instead of CONFIG_SMP
@ 2008-10-30 21:05 James Bottomley
  2008-10-30 21:27 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: James Bottomley @ 2008-10-30 21:05 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner; +Cc: linux-kernel

>From 6e5fbb4691fd68f5b03608c5d8d96e4f189e623a Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Wed, 29 Oct 2008 13:11:48 -0500
Subject: [VOYAGER] x86: use CONFIG_X86_SMP instead of CONFIG_SMP

CONFIG_SMP is used for features which work on *all* x86 boxes.
CONFIG_X86_SMP is used for standard PC like x86 boxes (for things like
multi core and apics)

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
 arch/x86/kernel/cpu/addon_cpuid_features.c |    2 +-
 arch/x86/kernel/tsc.c                      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
index 0d9c993..ef8f831 100644
--- a/arch/x86/kernel/cpu/addon_cpuid_features.c
+++ b/arch/x86/kernel/cpu/addon_cpuid_features.c
@@ -69,7 +69,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
  */
 void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_SMP
 	unsigned int eax, ebx, ecx, edx, sub_index;
 	unsigned int ht_mask_width, core_plus_mask_width;
 	unsigned int core_select_mask, core_level_siblings;
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 161bb85..62348e4 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void)
 	if (!cpu_has_tsc || tsc_unstable)
 		return 1;
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_SMP
 	if (apic_is_clustered_box())
 		return 1;
 #endif
-- 
1.5.6.5




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] x86: use CONFIG_X86_SMP instead of CONFIG_SMP
  2008-10-30 21:05 [PATCH] x86: use CONFIG_X86_SMP instead of CONFIG_SMP James Bottomley
@ 2008-10-30 21:27 ` Ingo Molnar
  0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-10-30 21:27 UTC (permalink / raw)
  To: James Bottomley; +Cc: Thomas Gleixner, linux-kernel, Yinghai Lu, H. Peter Anvin


* James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> >From 6e5fbb4691fd68f5b03608c5d8d96e4f189e623a Mon Sep 17 00:00:00 2001
> From: James Bottomley <James.Bottomley@HansenPartnership.com>
> Date: Wed, 29 Oct 2008 13:11:48 -0500
> Subject: [VOYAGER] x86: use CONFIG_X86_SMP instead of CONFIG_SMP
> 
> CONFIG_SMP is used for features which work on *all* x86 boxes. 
> CONFIG_X86_SMP is used for standard PC like x86 boxes (for things 
> like multi core and apics)

i've applied your fix to tip/x86/urgent, as it's obviously correct in 
the current scheme of things, thanks!

but that needless build-time distinction should go away. We can now 
support a whole host of 'weird' SMP boxes via genapic and x86_quirks.

	Ingo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-10-30 21:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-30 21:05 [PATCH] x86: use CONFIG_X86_SMP instead of CONFIG_SMP James Bottomley
2008-10-30 21:27 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).