tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6067d7e4 71492fd1

+10 -1
+1 -1
mm/Kconfig
··· 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
+9
mm/memory-failure.c
··· 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; ··· 166 164 167 165 return 0; 168 166 } 167 + #else 168 + int hwpoison_filter(struct page *p) 169 + { 170 + return 0; 171 + } 172 + #endif 173 + 169 174 EXPORT_SYMBOL_GPL(hwpoison_filter); 170 175 171 176 /*