---

yaml --- r: 230738 b: refs/heads/master c: 355b09c h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 003b635 · 003b635
1 parent 12a48c6
commit 003b635
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d40502ea580c35414a1466d86f96484910ebaec
+refs/heads/master: 355b09c47a0cbb73b3e65a57c03f157f2e7ddb0b
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -2244,8 +2244,16 @@ static bool sleeping_prematurely(pg_data_t *pgdat, int order, long remaining)
 		if (!populated_zone(zone))
 			continue;
 
-		if (zone->all_unreclaimable)
+		/*
+		 * balance_pgdat() skips over all_unreclaimable after
+		 * DEF_PRIORITY. Effectively, it considers them balanced so
+		 * they must be considered balanced here as well if kswapd
+		 * is to sleep
+		 */
+		if (zone->all_unreclaimable) {
+			balanced += zone->present_pages;
 			continue;
+		}
 
 		if (!zone_watermark_ok_safe(zone, order, high_wmark_pages(zone),
 								0, 0))