diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 10:38:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 10:38:34 -0700 |
commit | 9d98ece16f1a1df0f456a2ee9429d03e82e839a2 (patch) | |
tree | 3fabf9162cf855a4440bba7ab482360b77f1d7f7 /mm | |
parent | ba77d20ff56028128259a9282d06b938073f169c (diff) | |
parent | d949f36f1865c60239d4265b50c4b75354fcb8f3 (diff) | |
download | linux-3.10-9d98ece16f1a1df0f456a2ee9429d03e82e839a2.tar.gz linux-3.10-9d98ece16f1a1df0f456a2ee9429d03e82e839a2.tar.bz2 linux-3.10-9d98ece16f1a1df0f456a2ee9429d03e82e839a2.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix hwpoison code related build failure on 32-bit NUMAQ
Diffstat (limited to 'mm')
-rw-r--r-- | mm/Kconfig | 4 |
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 |