diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
commit | ae2c27a78f1df5b0967069cd3b916cff1eb044c8 (patch) | |
tree | e67f1012e76185bac2e78bb04caa68ed1f7dc2a2 /mm | |
parent | a608ab9cb6a5050394498b2520c6e7c162f4e2cf (diff) | |
parent | e34efe3b100d0fbdf053128956c3dd0bc68754d6 (diff) | |
download | op-kernel-dev-ae2c27a78f1df5b0967069cd3b916cff1eb044c8.zip op-kernel-dev-ae2c27a78f1df5b0967069cd3b916cff1eb044c8.tar.gz |
Merge ../linux-2.6
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fc5b544..2c606cc 100644 --- a/mm/page_alloc.c +++ b/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) |