aboutsummaryrefslogtreecommitdiffstats
path: root/linux-2.6-xen-sparse/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux-2.6-xen-sparse/mm/page_alloc.c')
-rw-r--r--linux-2.6-xen-sparse/mm/page_alloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-2.6-xen-sparse/mm/page_alloc.c b/linux-2.6-xen-sparse/mm/page_alloc.c
index c0f3c60537..f12323955a 100644
--- a/linux-2.6-xen-sparse/mm/page_alloc.c
+++ b/linux-2.6-xen-sparse/mm/page_alloc.c
@@ -951,7 +951,8 @@ restart:
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