From 006ce2b6d0d5992005f949a2ad8be333dc238ca8 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@engr.sgi.com>
Date: Fri, 24 Mar 2006 03:15:59 -0800
Subject: [PATCH] --- yaml --- r: 23412 b: refs/heads/master c:
 0b1303fcf23678ee1785841fb0c770a35cd0833c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 748fcc4c6a31..4c5bc9c19f4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95c3832272fc77ea3e31f6382f82ba17be985cc7
+refs/heads/master: 0b1303fcf23678ee1785841fb0c770a35cd0833c
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index b7f14a4799a5..a5c3f8bd98ae 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -943,7 +943,8 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 		goto got_pg;
 
 	do {
-		wakeup_kswapd(*z, order);
+		if (cpuset_zone_allowed(*z, gfp_mask))
+			wakeup_kswapd(*z, order);
 	} while (*(++z));
 
 	/*