summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2006-06-25 05:47:55 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 10:01:08 -0700
commit43b0bc00fdbf2f1503a57f0c2c1338438c5d2805 (patch)
tree1009ac1c764b21c50f96e2a108a2736504d9588a /mm
parentdc851a0fd2736e8dc3e90bd990cb911a0013da67 (diff)
downloadlinux-43b0bc00fdbf2f1503a57f0c2c1338438c5d2805.tar.bz2
[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>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 423db0db7c02..6c1174fcf52c 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));
/*