---

yaml --- r: 176283 b: refs/heads/master c: 4f0ddfd h: refs/heads/master i: 176281: d9078f3 176279: 9972d54 v: v3
git-mirror · Dec 15, 2009 · ba9f6e7 · ba9f6e7
1 parent c5e22f0
commit ba9f6e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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,