From dee6f986f5cfbfcda1ac0b70669d98560450189a Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 16 Dec 2009 12:20:01 +0100
Subject: [PATCH] --- yaml --- r: 177641 b: refs/heads/master c:
 0d57eb8dfcb92e3dd928d792f4ed2b2fec680bb7 h: refs/heads/master i:   177639:
 f4b900704f68b00d89305d28127e690c3cf3d87b v: v3

---
 [refs]                     | 2 +-
 trunk/mm/hwpoison-inject.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dba8af167d67..8ce1c62cb3d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afcf938ee0aac4ef95b1a23bac704c6fbeb26de6
+refs/heads/master: 0d57eb8dfcb92e3dd928d792f4ed2b2fec680bb7
diff --git a/trunk/mm/hwpoison-inject.c b/trunk/mm/hwpoison-inject.c
index a77fe3f9e211..10ea71905c1f 100644
--- a/trunk/mm/hwpoison-inject.c
+++ b/trunk/mm/hwpoison-inject.c
@@ -18,6 +18,8 @@ static int hwpoison_inject(void *data, u64 val)
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
+	if (!hwpoison_filter_enable)
+		goto inject;
 	if (!pfn_valid(pfn))
 		return -ENXIO;
 
@@ -48,6 +50,7 @@ static int hwpoison_inject(void *data, u64 val)
 	if (err)
 		return 0;
 
+inject:
 	printk(KERN_INFO "Injecting memory failure at pfn %lx\n", pfn);
 	return __memory_failure(pfn, 18, MF_COUNT_INCREASED);
 }