Skip to contentSkip to conversation

remove CONFIG_X86_NUMA

PATCH James Bottomley 4 participants 7 messages Dec 29, 2002

lore
Share & tools
lore

James Bottomley

author
#0 lore raw
Quoted 1 line

It's only used to hide two entries in arch/i386/Kconfig.

The patch looks good. If it's OK to get rid of X86_NUMA, could you also move X86_NUMAQ under the subarch menu?

Thanks,

James

#1 lore raw
Quoted 4 lines · James Bottomley
Quoted 1 line

It's only used to hide two entries in arch/i386/Kconfig.

The patch looks good. If it's OK to get rid of X86_NUMA, could you also move X86_NUMAQ under the subarch menu?

I already wondered about that, but AFAIK a kernel with X86_NUMAQ set still boots on a PeeCee, so it's really an option, not a choice.

author
#2 lore raw
Quoted 2 lines · [email protected] said:

I already wondered about that, but AFAIK a kernel with X86_NUMAQ set still boots on a PeeCee, so it's really an option, not a choice.

It alters the mflags-y and mcore-y variables in arch/i386/Makefile, so it's one of the subarch choices and thus should really be under the menu options.

James

#3 lore raw
Quoted 6 lines · James Bottomley
Quoted 2 lines · [email protected] said:

I already wondered about that, but AFAIK a kernel with X86_NUMAQ set still boots on a PeeCee, so it's really an option, not a choice.

It alters the mflags-y and mcore-y variables in arch/i386/Makefile, so it's one of the subarch choices and thus should really be under the menu options.

Okay, does this patch look better?

arch/i386/Kconfig +13 -19
@@ -49,7 +49,7 @@
 
 config VOYAGER
 	bool "NCR Voyager Architecture"
-	---help---
+	help
 	  Voyager is a MCA based 32 way capable SMP architecture proprietary
 	  to NCR Corp.  Machine classes 345x/35xx/4100/51xx are voyager based.
 	  

@@ -58,9 +58,19 @@
 	  If you do not specifically know you have a Voyager based machine,
 	  say N here otherwise the kernel you build will not be bootable.
 
+config X86_NUMAQ
+	bool "IBM/Sequent NUMAQ"
+	help
+	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA 
+	  multiquad box. This changes the way that processors are bootstrapped,
+	  and uses Clustered Logical APIC addressing mode instead of Flat Logical.
+	  You will need a new lynxer.elf file to flash your firmware with - send
+	  email to [email protected]
+
 # Visual Workstation support is utterly broken.
 # If you want to see it working mail an VW540 to [email protected] 8)
-#bool 'SGI Visual Workstation support' CONFIG_VISWS
+#config VISWS
+#	bool "SGI Visual Workstation support"
 
 endchoice
 

@@ -430,24 +440,8 @@
 	  This is purely to save memory - each supported CPU adds
 	  approximately eight kilobytes to the kernel image.
 
-config X86_NUMA
-	bool "Multi-node NUMA system support"
-	depends on SMP
-
-#Platform Choices
-config X86_NUMAQ
-	bool "Multiquad (IBM/Sequent) NUMAQ support"
-	depends on X86_NUMA
-	help
-	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA 
-	  multiquad box. This changes the way that processors are bootstrapped,
-	  and uses Clustered Logical APIC addressing mode instead of Flat Logical.
-	  You will need a new lynxer.elf file to flash your firmware with - send
-	  email to [email protected]
-
 config X86_SUMMIT
 	bool "IBM x440 (Summit/EXA) support"
-	depends on X86_NUMA
 	help
 	  This option is needed for IBM systems that use the Summit/EXA chipset.
 	  In particular, it is needed for the x440.

@@ -456,7 +450,7 @@
 
 config CLUSTERED_APIC
 	bool
-	depends on X86_NUMA && (X86_NUMAQ || X86_SUMMIT)
+	depends on X86_NUMAQ || X86_SUMMIT
 	default y
 
 # Common NUMA Features
#5 lore raw
In reply to Christoph Hellwig
Quoted 7 lines
Quoted 4 lines
Quoted 1 line

It's only used to hide two entries in arch/i386/Kconfig.

The patch looks good. If it's OK to get rid of X86_NUMA, could you also move X86_NUMAQ under the subarch menu?

I already wondered about that, but AFAIK a kernel with X86_NUMAQ set still boots on a PeeCee, so it's really an option, not a choice.

Nope, it won't boot on a PC - you're probably thinking of Summit, which should. I think Bill had a patch to move NUMA-Q already ... want to publish that one?

M.

#6 lore raw

At some point in the past, someone had their attribution removed from:

Quoted 2 lines
Quoted 2 lines

I already wondered about that, but AFAIK a kernel with X86_NUMAQ set still boots on a PeeCee, so it's really an option, not a choice.

Quoted 3 lines · Martin J. Bligh

Nope, it won't boot on a PC - you're probably thinking of Summit, which should. I think Bill had a patch to move NUMA-Q already ... want to publish that one?

It's just moving the 2 config decls inside the choice/endchoice bracket, not worth bothering with if it's getting fixed anyway.

Bill