From 7ed926e62ca48d26d019a69d0413a9016f412d37 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 22 Feb 2013 16:32:24 -0800 Subject: [PATCH] --- yaml --- r: 356493 b: refs/heads/master c: 62b726c1b3cde6ab49304e8c1af41950ed855c3c h: refs/heads/master i: 356491: c5a2331b9d26add8f87259b30ce20a99935637e2 v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5c42321e94b1..3955b2783957 100644 --- 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 index ef123356c6ab..292f50a2a685 100644 --- 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,