summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 09:35:07 -0700
committerIngo Molnar <mingo@elte.hu>2009-09-27 09:55:11 +0200
commitd949f36f1865c60239d4265b50c4b75354fcb8f3 (patch)
tree176a784ce7f6a71dc3ff544b70606f71025a13d8 /mm
parent0d9df2515dbceb67d343c0f10fd3ff218380d524 (diff)
downloadlinux-3.10-d949f36f1865c60239d4265b50c4b75354fcb8f3.tar.gz
linux-3.10-d949f36f1865c60239d4265b50c4b75354fcb8f3.tar.bz2
linux-3.10-d949f36f1865c60239d4265b50c4b75354fcb8f3.zip
x86: Fix hwpoison code related build failure on 32-bit NUMAQ
This build failure triggers: In file included from include/linux/suspend.h:8, from arch/x86/kernel/asm-offsets_32.c:11, from arch/x86/kernel/asm-offsets.c:2: include/linux/mm.h:503:2: error: #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > BITS_PER_LONG - NR_PAGEFLAGS Because due to the hwpoison page flag we ran out of page flags on 32-bit. Dont turn on hwpoison on 32-bit NUMA (it's rare in any case). Also clean up the Kconfig dependencies in the generic MM code by introducing ARCH_SUPPORTS_MEMORY_FAILURE. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 24776072959..edd300aca17 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -244,10 +244,12 @@ config DEFAULT_MMAP_MIN_ADDR
This value can be changed after boot using the
/proc/sys/vm/mmap_min_addr tunable.
+config ARCH_SUPPORTS_MEMORY_FAILURE
+ bool
config MEMORY_FAILURE
depends on MMU
- depends on X86_MCE
+ depends on ARCH_SUPPORTS_MEMORY_FAILURE
bool "Enable recovery from hardware memory errors"
help
Enables code to recover from some memory failures on systems