diff --git a/[refs] b/[refs]
index e155224e04ba..eb9ae4836658 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f56df2f4db6e4af87fb8e941cff69f4501a111df
+refs/heads/master: 6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index fc5b5442e942..2c606cc922a5 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -989,8 +989,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
 		      int classzone_idx, int alloc_flags)
 {
 	/* free_pages my go negative - that's OK */
-	unsigned long min = mark;
-	long free_pages = z->free_pages - (1 << order) + 1;
+	long min = mark, free_pages = z->free_pages - (1 << order) + 1;
 	int o;
 
 	if (alloc_flags & ALLOC_HIGH)