commit 0d57eb8dfcb92e3dd928d792f4ed2b2fec680bb7
author Andi Kleen <andi@firstfloor.org> Wed Dec 16 12:20:01 2009 +0100
committer Andi Kleen <ak@linux.intel.com> Wed Dec 16 12:20:01 2009 +0100
tree 2aaf6d64134d380b3f17efd3aebb09d453f09e1d
parent afcf938ee0aac4ef95b1a23bac704c6fbeb26de6

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

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

mm/hwpoison-inject.c

diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c
index a77fe3f..10ea719 100644
--- a/mm/hwpoison-inject.c
+++ b/mm/hwpoison-inject.c
@@ -18,6 +18,8 @@
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
+	if (!hwpoison_filter_enable)
+		goto inject;
 	if (!pfn_valid(pfn))
 		return -ENXIO;
 
@@ -48,6 +50,7 @@
 	if (err)
 		return 0;
 
+inject:
 	printk(KERN_INFO "Injecting memory failure at pfn %lx\n", pfn);
 	return __memory_failure(pfn, 18, MF_COUNT_INCREASED);
 }