From 34463ff47cd9f567b2aa2901de9ba6fb7b861a5c Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 16 Jun 2009 15:31:56 -0700
Subject: [PATCH] --- yaml --- r: 151527 b: refs/heads/master c:
 7f82af9742a9346794ecc1515139daed480e7025 h: refs/heads/master i:   151525:
 9b61f5721a28b2242aaed78fb9bc5f7dfd0ee176   151523:
 fff6ece3224bb1431bbd149908efec7274e8b6c2   151519:
 f997a8299e217d0fd8be257ebe2b457bfee722a7 v: v3

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

diff --git a/[refs] b/[refs]
index d257a8bb0622..3e34d216c3d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6484eb3e2a81807722c5f28efef94d8338b7b996
+refs/heads/master: 7f82af9742a9346794ecc1515139daed480e7025
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index bfbd95c0610f..6be8fcb6f74f 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1483,9 +1483,8 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
 	if (should_fail_alloc_page(gfp_mask, order))
 		return NULL;
 
-restart:
-	z = zonelist->_zonerefs;  /* the list of zones suitable for gfp_mask */
-
+	/* the list of zones suitable for gfp_mask */
+	z = zonelist->_zonerefs;
 	if (unlikely(!z->zone)) {
 		/*
 		 * Happens if we have an empty zonelist as a result of
@@ -1494,6 +1493,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
 		return NULL;
 	}
 
+restart:
 	page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, nodemask, order,
 			zonelist, high_zoneidx, ALLOC_WMARK_LOW|ALLOC_CPUSET);
 	if (page)