X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fhwpoison-inject.c;h=10ea71905c1fbbb8a9582737e05f78fefa86012e;hb=dcf097b247affd8b88ad410a92298590c5600f44;hp=a77fe3f9e211420adc7fda89ab098508aa8a99b2;hpb=facb6011f3993947283fa15d039dacb4ad140230;p=safe%2Fjmp%2Flinux-2.6

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 @@ 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);
 }