diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2006-06-25 05:47:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:08 -0700 |
| commit | 43b0bc00fdbf2f1503a57f0c2c1338438c5d2805 (patch) | |
| tree | 1009ac1c764b21c50f96e2a108a2736504d9588a | |
| parent | dc851a0fd2736e8dc3e90bd990cb911a0013da67 (diff) | |
| download | kernel-crypto-43b0bc00fdbf2f1503a57f0c2c1338438c5d2805.tar.gz kernel-crypto-43b0bc00fdbf2f1503a57f0c2c1338438c5d2805.tar.xz kernel-crypto-43b0bc00fdbf2f1503a57f0c2c1338438c5d2805.zip | |
[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>
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 423db0db7c0..6c1174fcf52 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)); /* |