From c9b9c4556a86a7746ff8395ba1c961fbe5fb94ce Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Tue, 31 Jul 2012 16:43:53 -0700 Subject: [PATCH] --- yaml --- r: 320816 b: refs/heads/master c: 2cfed0752808625d30aca7fc9f383af386fd8a13 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ee6bc48857a0..1f31f617e6be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee6f509c3274014d1f52e7a7a10aee9f85393c5e +refs/heads/master: 2cfed0752808625d30aca7fc9f383af386fd8a13 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 228194728ccd..2e6635993558 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1595,6 +1595,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark, { /* free_pages my go negative - that's OK */ long min = mark; + long lowmem_reserve = z->lowmem_reserve[classzone_idx]; int o; free_pages -= (1 << order) - 1; @@ -1603,7 +1604,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark, if (alloc_flags & ALLOC_HARDER) min -= min / 4; - if (free_pages <= min + z->lowmem_reserve[classzone_idx]) + if (free_pages <= min + lowmem_reserve) return false; for (o = 0; o < order; o++) { /* At the next order, this order's pages become unavailable */