---

yaml --- r: 38341 b: refs/heads/master c: e80ee88 h: refs/heads/master i: 38339: 4f149f5 v: v3
git-mirror · Oct 4, 2006 · 77c256b · 77c256b
1 parent 4bacb2c
commit 77c256b
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: b2abacf3a2699a8020829c85c16f358ba85cecaf
+refs/heads/master: e80ee884ae0e3794ef2b65a18a767d502ad712ee
diff --git 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)