diff --git a/[refs] b/[refs] index 1335cf030065..e8cc4e677273 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3eea484f7a1aadb70ed6665338026a09ad6ce85 +refs/heads/master: b43a57bb4dae72e8f7232e7c821a8799eda30022 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index cd47e8f7bd5b..a840e702722c 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1180,6 +1180,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, /* This allocation should allow future memory freeing. */ +rebalance: if (((p->flags & PF_MEMALLOC) || unlikely(test_thread_flag(TIF_MEMDIE))) && !in_interrupt()) { if (!(gfp_mask & __GFP_NOMEMALLOC)) { @@ -1201,7 +1202,6 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, if (!wait) goto nopage; -rebalance: cond_resched(); /* We now go into synchronous reclaim */