X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2FKconfig;h=edd300aca17309cfb6c2e1ef9cef2fcf36de1d74;hb=93c20d98c29ccefa039c3843ccc37122caaf3d31;hp=71eb0b4cce8dbc425aa476d54f2048e5679c7dea;hpb=ff830b8e5f999d1ccbd0282a666520f0b557daa4;p=mv-sheeva.git

diff --git a/mm/Kconfig b/mm/Kconfig
index 71eb0b4cce8..edd300aca17 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -244,6 +244,22 @@ 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 ARCH_SUPPORTS_MEMORY_FAILURE
+	bool "Enable recovery from hardware memory errors"
+	help
+	  Enables code to recover from some memory failures on systems
+	  with MCA recovery. This allows a system to continue running
+	  even when some of its memory has uncorrected errors. This requires
+	  special hardware support and typically ECC memory.
+
+config HWPOISON_INJECT
+	tristate "Poison pages injector"
+	depends on MEMORY_FAILURE && DEBUG_KERNEL
 
 config NOMMU_INITIAL_TRIM_EXCESS
 	int "Turn on mmap() excess space trimming before booting"