From ef67295ddd42ee45b90e1e72d196677e698454f9 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Fri, 15 Jan 2010 17:01:18 -0800
Subject: [PATCH] --- yaml --- r: 179397 b: refs/heads/master c:
 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 h: refs/heads/master i:   179395:
 b90daefd3ab41f55ed688675fed9f1b4cf33d792 v: v3

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

diff --git a/[refs] b/[refs]
index e06dc75f01d8..abde7bad6d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f0b8b95543118f97197a978560438c1ce88cd00
+refs/heads/master: 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 6ea4966a6334..d2a8889b4c58 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1222,10 +1222,10 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
 		}
 		spin_lock_irqsave(&zone->lock, flags);
 		page = __rmqueue(zone, order, migratetype);
-		__mod_zone_page_state(zone, NR_FREE_PAGES, -(1 << order));
 		spin_unlock(&zone->lock);
 		if (!page)
 			goto failed;
+		__mod_zone_page_state(zone, NR_FREE_PAGES, -(1 << order));
 	}
 
 	__count_zone_vm_events(PGALLOC, zone, 1 << order);