HWPOISON: Don't do early filtering if filter is disabled

Signed-off-by: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
Andi Kleen 2009-12-16 12:20:01 +01:00 committed by Andi Kleen
parent afcf938ee0
commit 0d57eb8dfc

View file

@ -18,6 +18,8 @@ static int hwpoison_inject(void *data, u64 val)
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
if (!hwpoison_filter_enable)
goto inject;
if (!pfn_valid(pfn)) if (!pfn_valid(pfn))
return -ENXIO; return -ENXIO;
@ -48,6 +50,7 @@ static int hwpoison_inject(void *data, u64 val)
if (err) if (err)
return 0; return 0;
inject:
printk(KERN_INFO "Injecting memory failure at pfn %lx\n", pfn); printk(KERN_INFO "Injecting memory failure at pfn %lx\n", pfn);
return __memory_failure(pfn, 18, MF_COUNT_INCREASED); return __memory_failure(pfn, 18, MF_COUNT_INCREASED);
} }