From a20b34aa59dd73666efb7e8ae9922d420e8a6ab7 Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Fri, 6 Jan 2006 00:10:32 -0800
Subject: [PATCH] --- yaml --- r: 16294 b: refs/heads/master c:
 47f3a867f6310d6abfa185ab12baaba7ed1d69af h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f4185e5517f7..8d5381da7b9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a576219aca70e6700705a9836e098dbecd25fb56
+refs/heads/master: 47f3a867f6310d6abfa185ab12baaba7ed1d69af
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index fe14a8c87fc2..1e49dc7cd619 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -903,8 +903,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 		alloc_flags |= ALLOC_HARDER;
 	if (gfp_mask & __GFP_HIGH)
 		alloc_flags |= ALLOC_HIGH;
-	if (wait)
-		alloc_flags |= ALLOC_CPUSET;
+	alloc_flags |= ALLOC_CPUSET;
 
 	/*
 	 * Go through the zonelist again. Let __GFP_HIGH and allocations
@@ -926,7 +925,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 nofail_alloc:
 			/* go through the zonelist yet again, ignoring mins */
 			page = get_page_from_freelist(gfp_mask, order,
-				zonelist, ALLOC_NO_WATERMARKS|ALLOC_CPUSET);
+				zonelist, ALLOC_NO_WATERMARKS);
 			if (page)
 				goto got_pg;
 			if (gfp_mask & __GFP_NOFAIL) {