From 41bbd98aede09e31653462568e95569206fbce43 Mon Sep 17 00:00:00 2001 From: Paul Jackson Date: Sat, 20 May 2006 15:00:09 -0700 Subject: [PATCH] --- yaml --- r: 26857 b: refs/heads/master c: bdd804f478a0cc74bf7db8e9f9d5fd379d1b31ca h: refs/heads/master i: 26855: ac3b1236e3abe949c405564b1200b582f4904cd6 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14a5fe64812b..1bb7d801914a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 593ee20766921fec643194dff829e17f30552220 +refs/heads/master: bdd804f478a0cc74bf7db8e9f9d5fd379d1b31ca diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 813b4ec1298a..bb3416932ab0 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -951,7 +951,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, goto got_pg; do { - if (cpuset_zone_allowed(*z, gfp_mask)) + if (cpuset_zone_allowed(*z, gfp_mask|__GFP_HARDWALL)) wakeup_kswapd(*z, order); } while (*(++z)); @@ -970,7 +970,8 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, alloc_flags |= ALLOC_HARDER; if (gfp_mask & __GFP_HIGH) alloc_flags |= ALLOC_HIGH; - alloc_flags |= ALLOC_CPUSET; + if (wait) + alloc_flags |= ALLOC_CPUSET; /* * Go through the zonelist again. Let __GFP_HIGH and allocations