Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b726c1 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm/vmscan.c:__zone_reclaim(): replace max_t() with max() 



"mm: vmscan: save work scanning (almost) empty LRU lists" made
SWAP_CLUSTER_MAX an unsigned long.

Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Satoru Moriya <satoru.moriya@hds.com>
Cc: Simon Jeons <simon.jeons@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 90ae8d67

mm/vmscan.c

+1 −2
Original line number Diff line number Diff line
@@ -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,