From 38741dd0adb19cebd90f447d49031ab3d5b7e0e9 Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Wed, 12 Dec 2012 13:52:30 -0800
Subject: [PATCH] --- yaml --- r: 343346 b: refs/heads/master c:
 5f24ae585be985691c017b7ab90b3669dca32d6d h: refs/heads/master v: v3

---
 [refs]          |  2 +-
 trunk/mm/rmap.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a249c7fa4a4b..f1957d508fa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c4894c6bc790d0e31e072202939ac6747bbe7ac
+refs/heads/master: 5f24ae585be985691c017b7ab90b3669dca32d6d
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index cf7e99a87c32..face808a489e 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -1249,12 +1249,14 @@ int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
 	update_hiwater_rss(mm);
 
 	if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) {
-		if (PageAnon(page))
-			dec_mm_counter(mm, MM_ANONPAGES);
-		else
-			dec_mm_counter(mm, MM_FILEPAGES);
+		if (!PageHuge(page)) {
+			if (PageAnon(page))
+				dec_mm_counter(mm, MM_ANONPAGES);
+			else
+				dec_mm_counter(mm, MM_FILEPAGES);
+		}
 		set_pte_at(mm, address, pte,
-				swp_entry_to_pte(make_hwpoison_entry(page)));
+			   swp_entry_to_pte(make_hwpoison_entry(page)));
 	} else if (PageAnon(page)) {
 		swp_entry_t entry = { .val = page_private(page) };