Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[mv-sheeva.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 8cea7fde06e128d3dc8375f019f4c79faa96cc0b..ee9f3e0f2b69d22c01d42334ef1a4227f7c1b794 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -221,6 +221,7 @@ config KSM
 
 config DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"
+       depends on MMU
         default 4096
         help
          This is the portion of low virtual memory which should be protected
@@ -251,7 +252,7 @@ config MEMORY_FAILURE
          special hardware support and typically ECC memory.
 
 config HWPOISON_INJECT
-       tristate "Poison pages injector"
+       tristate "HWPoison pages injector"
        depends on MEMORY_FAILURE && DEBUG_KERNEL
        select PROC_PAGE_MONITOR