---

yaml --- r: 283016 b: refs/heads/master c: df0a6da h: refs/heads/master v: v3
git-mirror · Jan 11, 2012 · d61fd3a · d61fd3a
1 parent e36f069
commit d61fd3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9571a982903bf9dcbca2479fd3e7dafd2211ecf9
+refs/heads/master: df0a6daa01fa3856c08f4274d4f21a8092caa480
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1525,7 +1525,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark,
 	long min = mark;
 	int o;
 
-	free_pages -= (1 << order) + 1;
+	free_pages -= (1 << order) - 1;
 	if (alloc_flags & ALLOC_HIGH)
 		min -= min / 2;
 	if (alloc_flags & ALLOC_HARDER)