---

yaml --- r: 356493 b: refs/heads/master c: 62b726c h: refs/heads/master i: 356491: c5a2331 v: v3
git-mirror · Feb 24, 2013 · 7ed926e · 7ed926e
1 parent fe47891
commit 7ed926e
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: 90ae8d670c12156f4328235aca1a528a8bfe6708
+refs/heads/master: 62b726c1b3cde6ab49304e8c1af41950ed855c3c
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -3333,8 +3333,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,
-		.nr_to_reclaim = max_t(unsigned long, nr_pages,
-				       SWAP_CLUSTER_MAX),
+		.nr_to_reclaim = max(nr_pages, SWAP_CLUSTER_MAX),
 		.gfp_mask = gfp_mask,
 		.order = order,
 		.priority = ZONE_RECLAIM_PRIORITY,