Skip to contentSkip to conversation

x86: clean up non-smp usage of cpu maps

DISCUSSION Andrew Morton 2 participants 3 messages Apr 19, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 11 lines · On Fri, 18 Apr 2008 17:36:55 GMT Linux Kernel Mailing List…

x86: clean up non-smp usage of cpu maps

Cleanup references to the early cpu maps for the non-SMP configuration and remove some functions called for SMP configurations only.

...

index 1179aa0..dc79409 100644

arch/x86/kernel/setup.c line 13

Quoted 5 lines
arch/x86/kernel/setup.c +1 -1
@@ -10,7 +10,7 @@
 #include <asm/setup.h>
 #include <asm/topology.h>
 
-#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
+#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)

This implies that we can have

	CONFIG_HAVE_SETUP_PER_CPU_AREA && !CONFIG_SMP

which a) appears to be true and b) seems rather dumb?

#2 lore raw
Quoted 16 lines · Andrew Morton
Quoted 14 lines · On Fri, 18 Apr 2008 17:36:55 GMT Linux Kernel Mailing List…

x86: clean up non-smp usage of cpu maps

Cleanup references to the early cpu maps for the non-SMP configuration and remove some functions called for SMP configurations only.

...

index 1179aa0..dc79409 100644

arch/x86/kernel/setup.c +0 -0
@@ -10,7 +10,7 @@
 #include <asm/setup.h>
 #include <asm/topology.h>
 
Quoted 8 lines

arch/x86/kernel/setup.c line 13

Quoted 2 lines
arch/x86/kernel/setup.c +1 -1
-#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
+#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)

This implies that we can have

	CONFIG_HAVE_SETUP_PER_CPU_AREA && !CONFIG_SMP

which a) appears to be true and b) seems rather dumb?

Yeah, I kind of picked that up in a code merge and didn't really look at it too closely. I should have checked the Kconfig file to make sure that it couldn't inadvertently get set if SMP is not set.

Thanks,
Mike

#3 lore raw
Quoted 22 lines · On Fri, 18 Apr 2008 19:21:50 -0700 Mike Travis <[email protected]> wrote:
Quoted 21 lines · Andrew Morton
Quoted 11 lines · On Fri, 18 Apr 2008 17:36:55 GMT Linux Kernel Mailing List…

x86: clean up non-smp usage of cpu maps

Cleanup references to the early cpu maps for the non-SMP configuration and remove some functions called for SMP configurations only.

...

index 1179aa0..dc79409 100644

arch/x86/kernel/setup.c line 13

Quoted 5 lines
arch/x86/kernel/setup.c +1 -1
@@ -10,7 +10,7 @@
 #include <asm/setup.h>
 #include <asm/topology.h>
 
-#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
+#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)

This implies that we can have

Quoted 7 lines
Quoted 3 lines
	CONFIG_HAVE_SETUP_PER_CPU_AREA && !CONFIG_SMP

which a) appears to be true and b) seems rather dumb?

Yeah, I kind of picked that up in a code merge and didn't really look at it too closely. I should have checked the Kconfig file to make sure that it couldn't inadvertently get set if SMP is not set.

config HAVE_SETUP_PER_CPU_AREA

	def_bool X86_64 || (X86_SMP && !X86_VOYAGER)

it _can_ get set at present on x86_64, which I assume is incorrect.