From ba9f6e79d848e8efe91e1de9c29aca2d02d03b4a Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 14 Dec 2009 17:59:13 -0800 Subject: [PATCH] --- yaml --- r: 176283 b: refs/heads/master c: 4f0ddfdffc8bef3a5eb9154734d68a6053194948 h: refs/heads/master i: 176281: d9078f39151d619170f454f1f82f6b520aa3e597 176279: 9972d540c143150004d87a458a1d33ba9a155c3b v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35fd09d75aa3..c26ef16092de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b51755c3b38483b574d363d5ee587283c3f7999 +refs/heads/master: 4f0ddfdffc8bef3a5eb9154734d68a6053194948 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 63bd521bb229..d55d106ad179 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2539,8 +2539,7 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE), .may_unmap = !!(zone_reclaim_mode & RECLAIM_SWAP), .may_swap = 1, - .swap_cluster_max = max_t(unsigned long, nr_pages, - SWAP_CLUSTER_MAX), + .swap_cluster_max = SWAP_CLUSTER_MAX, .nr_to_reclaim = max_t(unsigned long, nr_pages, SWAP_CLUSTER_MAX), .gfp_mask = gfp_mask,