From 08827905c7386aba67c97db4554ec2e4802ddad7 Mon Sep 17 00:00:00 2001
From: Wen Congyang <wency@cn.fujitsu.com>
Date: Tue, 11 Dec 2012 16:00:47 -0800
Subject: [PATCH] --- yaml --- r: 338730 b: refs/heads/master c:
 95a4774d055c72d96ab192a1c6675cbf4d513f71 h: refs/heads/master v: v3

---
 [refs]            |  2 +-
 trunk/mm/sparse.c | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 71aa02ca63b3..b448f5fbe49a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b023f46813cde6e3b8a8c24f432ff9c1fd8e9a64
+refs/heads/master: 95a4774d055c72d96ab192a1c6675cbf4d513f71
diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c
index a83de2f72b30..c7be01906998 100644
--- a/trunk/mm/sparse.c
+++ b/trunk/mm/sparse.c
@@ -771,6 +771,27 @@ int __meminit sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
 	return ret;
 }
 
+#ifdef CONFIG_MEMORY_FAILURE
+static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
+{
+	int i;
+
+	if (!memmap)
+		return;
+
+	for (i = 0; i < PAGES_PER_SECTION; i++) {
+		if (PageHWPoison(&memmap[i])) {
+			atomic_long_sub(1, &mce_bad_pages);
+			ClearPageHWPoison(&memmap[i]);
+		}
+	}
+}
+#else
+static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
+{
+}
+#endif
+
 void sparse_remove_one_section(struct zone *zone, struct mem_section *ms)
 {
 	struct page *memmap = NULL;
@@ -784,6 +805,7 @@ void sparse_remove_one_section(struct zone *zone, struct mem_section *ms)
 		ms->pageblock_flags = NULL;
 	}
 
+	clear_hwpoisoned_pages(memmap, PAGES_PER_SECTION);
 	free_section_usemap(memmap, usemap);
 }
 #endif