From 4b346574147682435c28ac1e1936c664d65761f0 Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Mon, 19 Oct 2009 08:15:01 +0200
Subject: [PATCH] --- yaml --- r: 167856 b: refs/heads/master c:
 7456b0405d8fc063c49628f969cdb23be060fc80 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 393d4cf66ef5..95748bfae3c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65a64464349883891e21e74af16c05d6e1eeb4e9
+refs/heads/master: 7456b0405d8fc063c49628f969cdb23be060fc80
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index e354b9f2f389..dacc64183874 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -613,13 +613,16 @@ static int page_action(struct page_state *ps, struct page *p,
 			unsigned long pfn, int ref)
 {
 	int result;
+	int count;
 
 	result = ps->action(p, pfn);
 	action_result(pfn, ps->msg, result);
-	if (page_count(p) != 1 + ref)
+
+	count = page_count(p) - 1 - ref;
+	if (count != 0)
 		printk(KERN_ERR
 		       "MCE %#lx: %s page still referenced by %d users\n",
-		       pfn, ps->msg, page_count(p) - 1);
+		       pfn, ps->msg, count);
 
 	/* Could do more checks here if page looks ok */
 	/*