Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 27df5068e24f2f88de98e95eb6e8dbc9800bf80e

Authored by Andi Kleen
Committed by Andi Kleen
1 parent dd59f6c76b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

HWPOISON: Add PROC_FS dependency to hwpoison injector v2 

The injector filter requires stable_page_flags() which is supplied
by procfs. So make it dependent on that.

Also add ifdefs around the filter code in memory-failure.c so that
when the filter is disabled due to missing dependencies the whole
code still builds.

Reported-by: Ingo Molnar
Signed-off-by: Andi Kleen <ak@linux.intel.com>

Showing 2 changed files with 10 additions and 1 deletions Side-by-side Diff

... ... @@ -253,7 +253,7 @@
253 253  
254 254 config HWPOISON_INJECT
255 255 tristate "HWPoison pages injector"
256   - depends on MEMORY_FAILURE && DEBUG_KERNEL
  256 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
257 257 select PROC_PAGE_MONITOR
258 258  
259 259 config NOMMU_INITIAL_TRIM_EXCESS
... ... @@ -52,6 +52,8 @@
52 52  
53 53 atomic_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 +
55 57 u32 hwpoison_filter_enable = 0;
56 58 u32 hwpoison_filter_dev_major = ~0U;
57 59 u32 hwpoison_filter_dev_minor = ~0U;
... ... @@ -164,6 +166,13 @@
164 166  
165 167 return 0;
166 168 }
  169 +#else
  170 +int hwpoison_filter(struct page *p)
  171 +{
  172 + return 0;
  173 +}
  174 +#endif
  175 +
167 176 EXPORT_SYMBOL_GPL(hwpoison_filter);
168 177  
169 178 /*