Commit 38e716aa authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

[PATCH] x86: NUMAQ Kconfig fix 



When we select NUMA with i386, the system is only X86_NUMAQ or using ACPI.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f5ef68da

arch/i386/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ config X86_SUMMIT 
	  In particular, it is needed for the x440.



	  If you don't have one of these computers, you should say N here.

	  If you want to build a NUMA kernel, you must select ACPI.



config X86_BIGSMP

	bool "Support for other sub-arch SMP systems with more than 8 CPUs"
@@ -169,6 +170,7 @@ config X86_GENERICARCH 
       help

          This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.

	  It is intended for a generic binary kernel.

	  If you want a NUMA kernel, select ACPI.   We need SRAT for NUMA.



config X86_ES7000

	bool "Support for Unisys ES7000 IA32 series"
@@ -542,7 +544,7 @@ config X86_PAE 
# Common NUMA Features

config NUMA

	bool "Numa Memory Allocation and Scheduler Support"

	depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI))

	depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI)

	default n if X86_PC

	default y if (X86_NUMAQ || X86_SUMMIT)