diff --git a/[refs] b/[refs]
index 358bb110769e..66e7e015b0f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2abacf3a2699a8020829c85c16f358ba85cecaf
+refs/heads/master: e80ee884ae0e3794ef2b65a18a767d502ad712ee
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 4f59d90b81e6..b5468de49869 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -900,7 +900,8 @@ 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 */
-	long min = mark, free_pages = z->free_pages - (1 << order) + 1;
+	unsigned long min = mark;
+	long free_pages = z->free_pages - (1 << order) + 1;
 	int o;
 
 	if (alloc_flags & ALLOC_HIGH)