diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:53:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:53:02 -0800 |
| commit | 3108864e2d70891d30d60af6af256a1b517d7078 (patch) | |
| tree | f127ddaf0b582098caf7f9e3ed18ed535324eae4 /arch/x86/Kconfig | |
| parent | 4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d (diff) | |
| parent | 604d20554883cf03f888440d58ea7c6d36899839 (diff) | |
| download | kernel_samsung_smdk4412-3108864e2d70891d30d60af6af256a1b517d7078.zip kernel_samsung_smdk4412-3108864e2d70891d30d60af6af256a1b517d7078.tar.gz kernel_samsung_smdk4412-3108864e2d70891d30d60af6af256a1b517d7078.tar.bz2 | |
Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: make NUMA on 32-bit depend on EXPERIMENTAL again
x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set
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 fd2de70..ac22bb7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -960,7 +960,7 @@ config ARCH_PHYS_ADDR_T_64BIT config NUMA bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" depends on SMP - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN) + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) default n if X86_PC default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) help |