---

yaml --- r: 250940 b: refs/heads/master c: cfa54a0 h: refs/heads/master v: v3
git-mirror · May 25, 2011 · c94e3f4 · c94e3f4
1 parent ffa81fb
commit c94e3f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a539f3533b78e39a22723d6d3e1e11b6c14454d9
+refs/heads/master: cfa54a0fcfc1017c6f122b6f21aaba36daa07f71
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -2106,14 +2106,14 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 		first_zones_zonelist(zonelist, high_zoneidx, NULL,
 					&preferred_zone);
 
+rebalance:
 	/* This is the last chance, in general, before the goto nopage. */
 	page = get_page_from_freelist(gfp_mask, nodemask, order, zonelist,
 			high_zoneidx, alloc_flags & ~ALLOC_NO_WATERMARKS,
 			preferred_zone, migratetype);
 	if (page)
 		goto got_pg;
 
-rebalance:
 	/* Allocate without watermarks if the context allows */
 	if (alloc_flags & ALLOC_NO_WATERMARKS) {
 		page = __alloc_pages_high_priority(gfp_mask, order,