---

yaml --- r: 151527 b: refs/heads/master c: 7f82af9 h: refs/heads/master i: 151525: 9b61f57 151523: fff6ece 151519: f997a82 v: v3
git-mirror · Jun 17, 2009 · 34463ff · 34463ff
1 parent 56948c5
commit 34463ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)