UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] x86: some fixups for the X86_NUMAQ dependencies 

You must always ensure to fulfill the dependencies of what you are
select'ing.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Martin Bligh <mbligh@google.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk 2006-03-23 02:59:55 -08:00 committed by Linus Torvalds
parent 42c059e04d
commit 905c399594
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/i386/Kconfig
View File

@ -80,6 +80,7 @@ config X86_VOYAGER
config X86_NUMAQ config X86_NUMAQ
bool "NUMAQ (IBM/Sequent)" bool "NUMAQ (IBM/Sequent)"
select SMP
select NUMA select NUMA
help help
This option is used for getting Linux to run on a (IBM/Sequent) NUMA This option is used for getting Linux to run on a (IBM/Sequent) NUMA
@ -400,6 +401,7 @@ choice
config NOHIGHMEM config NOHIGHMEM
bool "off" bool "off"
depends on !X86_NUMAQ
---help--- ---help---
Linux can use up to 64 Gigabytes of physical memory on x86 systems. Linux can use up to 64 Gigabytes of physical memory on x86 systems.
However, the address space of 32-bit x86 processors is only 4 However, the address space of 32-bit x86 processors is only 4
@ -436,6 +438,7 @@ config NOHIGHMEM
config HIGHMEM4G config HIGHMEM4G
bool "4GB" bool "4GB"
depends on !X86_NUMAQ
help help
Select this if you have a 32-bit processor and between 1 and 4 Select this if you have a 32-bit processor and between 1 and 4
gigabytes of physical RAM. gigabytes of physical RAM.
@ -503,10 +506,6 @@ config NUMA
default n if X86_PC default n if X86_PC
default y if (X86_NUMAQ || X86_SUMMIT) default y if (X86_NUMAQ || X86_SUMMIT)
# Need comments to help the hapless user trying to turn on NUMA support
comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
depends on X86_NUMAQ && (!HIGHMEM64G || !SMP)
comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)