Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 8cea7fde06e128d3dc8375f019f4c79faa96cc0b..17b8947aa7daff59f0a92713f1fe97c8cf9fa721 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,8 +252,8 @@ config MEMORY_FAILURE
          special hardware support and typically ECC memory.
 
 config HWPOISON_INJECT
-       tristate "Poison pages injector"
-       depends on MEMORY_FAILURE && DEBUG_KERNEL
+       tristate "HWPoison pages injector"
+       depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
        select PROC_PAGE_MONITOR
 
 config NOMMU_INITIAL_TRIM_EXCESS