From 31b8f0d89f73ea13cb26c09ab5cf6276858fb9c7 Mon Sep 17 00:00:00 2001 From: Dave Hansen Date: Wed, 21 Nov 2012 14:21:51 -0500 Subject: [PATCH] --- yaml --- r: 335877 b: refs/heads/master c: ef6c5be658f6a70c1256fbd18e18ee0dc24c3386 h: refs/heads/master i: 335875: 72f76e2b37e226ac007c549b0392f87ccc21ebb3 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0892be3520bf..76b1ebc80567 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db9d8c60266a5010e905829e10cd722519e14777 +refs/heads/master: ef6c5be658f6a70c1256fbd18e18ee0dc24c3386 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 7bb35ac0964a..bcb72c6e2b2d 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1405,7 +1405,7 @@ int capture_free_page(struct page *page, int alloc_order, int migratetype) mt = get_pageblock_migratetype(page); if (unlikely(mt != MIGRATE_ISOLATE)) - __mod_zone_freepage_state(zone, -(1UL << order), mt); + __mod_zone_freepage_state(zone, -(1UL << alloc_order), mt); if (alloc_order != order) expand(zone, page, alloc_order, order,