diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2013-02-22 19:32:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 20:50:10 -0500 |
commit | 90ae8d670c12156f4328235aca1a528a8bfe6708 (patch) | |
tree | 91f1556b416397b8119c9884fe81fe24f451b9b9 /mm/page_alloc.c | |
parent | af34770e55fd899c96d8d73bdc04dbc956096650 (diff) |
mm/page_alloc.c:__setup_per_zone_wmarks: make min_pages unsigned long
`int' is an inappropriate type for a number-of-pages counter.
While we're there, use the clamp() macro.
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Reviewed-by: 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 804cc62ab72f..703944809666 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -5247,13 +5247,10 @@ static void __setup_per_zone_wmarks(void) | |||
5247 | * deltas controls asynch page reclaim, and so should | 5247 | * deltas controls asynch page reclaim, and so should |
5248 | * not be capped for highmem. | 5248 | * not be capped for highmem. |
5249 | */ | 5249 | */ |
5250 | int min_pages; | 5250 | unsigned long min_pages; |
5251 | 5251 | ||
5252 | min_pages = zone->present_pages / 1024; | 5252 | min_pages = zone->present_pages / 1024; |
5253 | if (min_pages < SWAP_CLUSTER_MAX) | 5253 | min_pages = clamp(min_pages, SWAP_CLUSTER_MAX, 128UL); |
5254 | min_pages = SWAP_CLUSTER_MAX; | ||
5255 | if (min_pages > 128) | ||
5256 | min_pages = 128; | ||
5257 | zone->watermark[WMARK_MIN] = min_pages; | 5254 | zone->watermark[WMARK_MIN] = min_pages; |
5258 | } else { | 5255 | } else { |
5259 | /* | 5256 | /* |