From: Chris Wright <chrisw@sous-sol.org>
Date: Sun, 25 Jun 2006 12:47:55 +0000 (-0700)
Subject: [PATCH] cpuset: remove extra cpuset_zone_allowed check in __alloc_pages
X-Git-Tag: v2.6.18-rc1~980
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=43b0bc00fdbf2f1503a57f0c2c1338438c5d2805;p=safe%2Fjmp%2Flinux-2.6

[PATCH] cpuset: remove extra cpuset_zone_allowed check in __alloc_pages

This is redundant with check in wakeup_kswapd.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Acked-by: Paul Jackson <pj@sgi.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 423db0d..6c1174f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -957,8 +957,7 @@ restart:
 		goto got_pg;
 
 	do {
-		if (cpuset_zone_allowed(*z, gfp_mask|__GFP_HARDWALL))
-			wakeup_kswapd(*z, order);
+		wakeup_kswapd(*z, order);
 	} while (*(++z));
 
 	/*