From c94e3f4831d4cb263698c8b39b63451e53c7b046 Mon Sep 17 00:00:00 2001 From: Andrew Barry Date: Tue, 24 May 2011 17:12:52 -0700 Subject: [PATCH] --- yaml --- r: 250940 b: refs/heads/master c: cfa54a0fcfc1017c6f122b6f21aaba36daa07f71 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4a62296535fe..c716222420f6 100644 --- 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 index 10a8c6da385f..2a00f17c3bf4 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2106,6 +2106,7 @@ __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, @@ -2113,7 +2114,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 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,