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)