diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 04:46:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 04:46:18 -0500 |
| commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
| tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /arch/x86/Kconfig | |
| parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
| parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) | |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7bf10f9b25a3..986e09a76b86 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -949,7 +949,7 @@ config ARCH_PHYS_ADDR_T_64BIT | |||
| 949 | config NUMA | 949 | config NUMA |
| 950 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" | 950 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" |
| 951 | depends on SMP | 951 | depends on SMP |
| 952 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) | 952 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN) |
| 953 | default n if X86_PC | 953 | default n if X86_PC |
| 954 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) | 954 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) |
| 955 | help | 955 | help |