From d61fd3a203d7e8ea111c1b7b997adae07a08a8d7 Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.cz>
Date: Tue, 10 Jan 2012 15:08:02 -0800
Subject: [PATCH] --- yaml --- r: 283016 b: refs/heads/master c:
 df0a6daa01fa3856c08f4274d4f21a8092caa480 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1af62440ea00..f5b5b32eacc0 100644
--- 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
index 4f95bcf0f2b1..59153da58c69 100644
--- 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)