aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-01-29 18:14:46 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-29 18:20:22 -0500
commit4272ebfbefd0db40073f3ee5990bceaf2894f08b (patch)
treebe8bddaf6a5a549a9aa9108df3515741cc469199 /arch/x86/Kconfig
parentfbeb2ca0224182033f196cf8f63989c3e6b90aba (diff)
x86: allow more than 8 cpus to be used on 32-bit
X86_PC is the only remaining 'sub' architecture, so we dont need it anymore. This also cleans up a few spurious references to X86_PC in the driver space - those certainly should be X86. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5bf0e0c58289..afaf2cb7c1ac 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -262,9 +262,6 @@ config X86_MPPARSE
262 For old smp systems that do not have proper acpi support. Newer systems 262 For old smp systems that do not have proper acpi support. Newer systems
263 (esp with 64bit cpus) with acpi support, MADT and DSDT will override it 263 (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
264 264
265config X86_PC
266 def_bool y
267
268config X86_NON_STANDARD 265config X86_NON_STANDARD
269 bool "Support for non-standard x86 platforms" 266 bool "Support for non-standard x86 platforms"
270 help 267 help
@@ -1019,7 +1016,6 @@ config NUMA
1019 bool "Numa Memory Allocation and Scheduler Support" 1016 bool "Numa Memory Allocation and Scheduler Support"
1020 depends on SMP 1017 depends on SMP
1021 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) 1018 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
1022 default n if X86_PC
1023 default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) 1019 default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
1024 help 1020 help
1025 Enable NUMA (Non Uniform Memory Access) support. 1021 Enable NUMA (Non Uniform Memory Access) support.
@@ -1122,7 +1118,7 @@ config ARCH_SPARSEMEM_DEFAULT
1122 1118
1123config ARCH_SPARSEMEM_ENABLE 1119config ARCH_SPARSEMEM_ENABLE
1124 def_bool y 1120 def_bool y
1125 depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_32_NON_STANDARD 1121 depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
1126 select SPARSEMEM_STATIC if X86_32 1122 select SPARSEMEM_STATIC if X86_32
1127 select SPARSEMEM_VMEMMAP_ENABLE if X86_64 1123 select SPARSEMEM_VMEMMAP_ENABLE if X86_64
1128 1124