---

yaml --- r: 356492 b: refs/heads/master c: 90ae8d6 h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · fe47891 · fe47891
1 parent c5a2331
commit fe47891
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af34770e55fd899c96d8d73bdc04dbc956096650
+refs/heads/master: 90ae8d670c12156f4328235aca1a528a8bfe6708
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -5247,13 +5247,10 @@ static void __setup_per_zone_wmarks(void)
 			 * deltas controls asynch page reclaim, and so should
 			 * not be capped for highmem.
 			 */
-			int min_pages;
+			unsigned long min_pages;
 
 			min_pages = zone->present_pages / 1024;
-			if (min_pages < SWAP_CLUSTER_MAX)
-				min_pages = SWAP_CLUSTER_MAX;
-			if (min_pages > 128)
-				min_pages = 128;
+			min_pages = clamp(min_pages, SWAP_CLUSTER_MAX, 128UL);
 			zone->watermark[WMARK_MIN] = min_pages;
 		} else {
 			/*