From 259453d8609b0d432cc84be5a5dadfa4c43ddb04 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 31 Jan 2007 16:43:36 -0800 Subject: [PATCH] --- yaml --- r: 46007 b: refs/heads/master c: 6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e h: refs/heads/master i: 46005: 3aaa5a03b8ad44f4392d8c949fff60cf6a60c6f6 46003: c3a3241f22d11563a58b9d58f178a1389622928c 45999: 9e06b98f71663941de871bc15e8abfb6bc413319 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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)