From 57ec9d11e75ea82d050e23c896e425f0304a7121 Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Wed, 12 Dec 2012 13:52:28 -0800
Subject: [PATCH] --- yaml --- r: 343345 b: refs/heads/master c:
 8c4894c6bc790d0e31e072202939ac6747bbe7ac h: refs/heads/master i:   343343:
 db5d6af9a7010aa32f1ac6a05af975576a389832 v: v3

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

diff --git a/[refs] b/[refs]
index d9b2fd5f07e3..a249c7fa4a4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4128997b5f0e7ad583a5f3990051b8188b39055c
+refs/heads/master: 8c4894c6bc790d0e31e072202939ac6747bbe7ac
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index bd22bd895299..e53f39cd67db 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -2386,8 +2386,10 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
 		/*
 		 * HWPoisoned hugepage is already unmapped and dropped reference
 		 */
-		if (unlikely(is_hugetlb_entry_hwpoisoned(pte)))
+		if (unlikely(is_hugetlb_entry_hwpoisoned(pte))) {
+			pte_clear(mm, address, ptep);
 			continue;
+		}
 
 		page = pte_page(pte);
 		/*