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

Commit b0bd35e6 authored by Ravikiran G Thirumalai's avatar Ravikiran G Thirumalai Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Make ACPI NUMA and NUMA emulation peers of K8_NUMA in Kconfig 



On x86_64 arches, there is no way to choose ACPI_NUMA without having to choose
K8_NUMA.  CONFIG_K8_NUMA is not needed for Intel EM64T NUMA boxes.  It also
looks odd if you have to select ACPI_NUMA from the power management menu.
This patch fixes those oddities.  Patch does the following:

1. Makes NUMA a config option like other arches
2. Makes topology detection options like K8_NUMA dependent on NUMA
3. Choosing ACPI NUMA detection can be done from the standard
   "Processor type and features" menu

AK: I fixed up the dependencies and changed the help texts a bit
on top of Kiran's patch.

Signed-off-by: default avatarRavikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: default avatarShai Fultheim <shai@scalex86.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent efbbdce9

arch/x86_64/Kconfig

+32 −15
Original line number Original line Diff line number Diff line
@@ -226,22 +226,42 @@ config SCHED_SMT 




source "kernel/Kconfig.preempt"

source "kernel/Kconfig.preempt"





config K8_NUMA

config NUMA

       bool "K8 NUMA support"

       bool "Non Uniform Memory Access (NUMA) Support"

       select NUMA

       depends on SMP

       depends on SMP

       help

       help

	  Enable NUMA (Non Unified Memory Architecture) support for

	 Enable NUMA (Non Uniform Memory Access) support. The kernel 

	  AMD Opteron Multiprocessor systems. The kernel will try to allocate

	 will try to allocate memory used by a CPU on the local memory 

	  memory used by a CPU on the local memory controller of the CPU

	 controller of the CPU and add some more NUMA awareness to the kernel.

	  and add some more NUMA awareness to the kernel.

	 This code is recommended on all multiprocessor Opteron systems.

	  This code is recommended on all multiprocessor Opteron systems

	 If the system is EM64T, you should say N unless your system is EM64T 

	  and normally doesn't hurt on others.

	 NUMA. 



config K8_NUMA

       bool "Old style AMD Opteron NUMA detection"

       depends on NUMA

       default y

       help

	 Enable K8 NUMA node topology detection.  You should say Y here if

	 you have a multi processor AMD K8 system. This uses an old

	 method to read the NUMA configurtion directly from the builtin

	 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA

	 instead, which also takes priority if both are compiled in.   



# Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.



config X86_64_ACPI_NUMA

       bool "ACPI NUMA detection"

       depends on NUMA

       select ACPI 

       select ACPI_NUMA

       default y

       help

	 Enable ACPI SRAT based node topology detection.





config NUMA_EMU

config NUMA_EMU

	bool "NUMA emulation support"

	bool "NUMA emulation"

	select NUMA

	depends on NUMA

	depends on SMP

	help

	help

	  Enable NUMA emulation. A flat machine will be split

	  Enable NUMA emulation. A flat machine will be split

	  into virtual nodes when booted with "numa=fake=N", where N is the

	  into virtual nodes when booted with "numa=fake=N", where N is the
@@ -252,9 +272,6 @@ config ARCH_DISCONTIGMEM_ENABLE 
       depends on NUMA

       depends on NUMA

       default y

       default y





config NUMA

       bool

       default n





config ARCH_DISCONTIGMEM_ENABLE

config ARCH_DISCONTIGMEM_ENABLE

	def_bool y

	def_bool y