aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 16:01:13 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 16:01:13 -0500
commit6067d7e4f05e5c08617cf95032867d892035e581 (patch)
treeca8205a2514936bce2cd0942e0806dc43b0436dc
parent71492fd1bdd4734d8efd20fe00ebf31027d86d3c (diff)
parent27df5068e24f2f88de98e95eb6e8dbc9800bf80e (diff)
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
* 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: HWPOISON: Add PROC_FS dependency to hwpoison injector v2
-rw-r--r--mm/Kconfig2
-rw-r--r--mm/memory-failure.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index ee9f3e0f2b69..17b8947aa7da 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -253,7 +253,7 @@ config MEMORY_FAILURE
253 253
254config HWPOISON_INJECT 254config HWPOISON_INJECT
255 tristate "HWPoison pages injector" 255 tristate "HWPoison pages injector"
256 depends on MEMORY_FAILURE && DEBUG_KERNEL 256 depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
257 select PROC_PAGE_MONITOR 257 select PROC_PAGE_MONITOR
258 258
259config NOMMU_INITIAL_TRIM_EXCESS 259config NOMMU_INITIAL_TRIM_EXCESS
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 6a0466ed5bfd..17299fd4577c 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -52,6 +52,8 @@ int sysctl_memory_failure_recovery __read_mostly = 1;
52 52
53atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0); 53atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
54 54
55#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
56
55u32 hwpoison_filter_enable = 0; 57u32 hwpoison_filter_enable = 0;
56u32 hwpoison_filter_dev_major = ~0U; 58u32 hwpoison_filter_dev_major = ~0U;
57u32 hwpoison_filter_dev_minor = ~0U; 59u32 hwpoison_filter_dev_minor = ~0U;
@@ -164,6 +166,13 @@ int hwpoison_filter(struct page *p)
164 166
165 return 0; 167 return 0;
166} 168}
169#else
170int hwpoison_filter(struct page *p)
171{
172 return 0;
173}
174#endif
175
167EXPORT_SYMBOL_GPL(hwpoison_filter); 176EXPORT_SYMBOL_GPL(hwpoison_filter);
168 177
169/* 178/*