From 0ff6dca42798a53c2a77cdd3c1c9a4e251294314 Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Wed, 8 Sep 2010 10:19:40 +0900
Subject: [PATCH] --- yaml --- r: 217349 b: refs/heads/master c:
 6a90181c7b0558b86179c1f5bcf3ab11f9d1bd30 h: refs/heads/master i:   217347:
 516d1ecdea33b6c05919452aceed708be832a924 v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory-failure.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 79734d3350be..fc6137649769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d950b95882f3dc47e86f1496cd3f7fef540d6d6b
+refs/heads/master: 6a90181c7b0558b86179c1f5bcf3ab11f9d1bd30
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index 74eb425010af..14589a228e97 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -1202,9 +1202,9 @@ int unpoison_memory(unsigned long pfn)
 		pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
 		atomic_long_sub(nr_pages, &mce_bad_pages);
 		freeit = 1;
+		if (PageHuge(page))
+			clear_page_hwpoison_huge_page(page);
 	}
-	if (PageHuge(p))
-		clear_page_hwpoison_huge_page(page);
 	unlock_page(page);
 
 	put_page(page);