Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 017d9d20 authored Oct 30, 2008 by James Bottomley Committed by Ingo Molnar Oct 30, 2008

x86: use CONFIG_X86_SMP instead of CONFIG_SMP



Impact: fix x86/Voyager boot

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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 08c33308

arch/x86/kernel/cpu/addon_cpuid_features.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/kernel/tsc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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