---

yaml --- r: 320816 b: refs/heads/master c: 2cfed07 h: refs/heads/master v: v3
git-mirror · Aug 1, 2012 · c9b9c45 · c9b9c45
1 parent f32dc24
commit c9b9c45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee6f509c3274014d1f52e7a7a10aee9f85393c5e
+refs/heads/master: 2cfed0752808625d30aca7fc9f383af386fd8a13
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1595,6 +1595,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark,
 {
 	/* free_pages my go negative - that's OK */
 	long min = mark;
+	long lowmem_reserve = z->lowmem_reserve[classzone_idx];
 	int o;
 
 	free_pages -= (1 << order) - 1;
@@ -1603,7 +1604,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark,
 	if (alloc_flags & ALLOC_HARDER)
 		min -= min / 4;
 
-	if (free_pages <= min + z->lowmem_reserve[classzone_idx])
+	if (free_pages <= min + lowmem_reserve)
 		return false;
 	for (o = 0; o < order; o++) {
 		/* At the next order, this order's pages become unavailable */