diff --git a/[refs] b/[refs] index 7f1ef5853d2e..240427740ab6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc851a0fd2736e8dc3e90bd990cb911a0013da67 +refs/heads/master: 43b0bc00fdbf2f1503a57f0c2c1338438c5d2805 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 423db0db7c02..6c1174fcf52c 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -957,8 +957,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, goto got_pg; do { - if (cpuset_zone_allowed(*z, gfp_mask|__GFP_HARDWALL)) - wakeup_kswapd(*z, order); + wakeup_kswapd(*z, order); } while (*(++z)); /*