HWPOISON, hugetlb: fix unpoison for hugepage

Currently unpoisoning hugepages doesn't work correctly because clearing PG_HWPoison is done outside if (TestClearPageHWPoison). This patch fixes it. Signed-off-by: Naoya Horiguchi <[email protected]> Signed-off-by: Jun'ichi Nomura <[email protected]> Acked-by: Mel Gorman <[email protected]> Signed-off-by: Andi Kleen <[email protected]>
kyagi · Oct 8, 2010 · 6a90181 · 6a90181
1 parent d950b95
commit 6a90181
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mm/memory-failure.c b/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);