From b8a7d34b6a173a8188ea064c6990fab71fae053e Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Fri, 29 Jan 2010 17:46:34 +0000 Subject: [PATCH] --- yaml --- r: 180059 b: refs/heads/master c: a7016235a61d520e6806f38129001d935c4b6661 h: refs/heads/master i: 180057: fc4c5f09b193c02534cd13bc2653bc52ebf0dd03 180055: e7d6111d959aa126ef88ed50f2a3fad4057fb0ac v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 64a8052f5f76..51e8d96cc9a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67f15b06c1a7e5417b7042b515ca2695de30beda +refs/heads/master: a7016235a61d520e6806f38129001d935c4b6661 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index d2a8889b4c58..8deb9d0fd5b1 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -556,8 +556,9 @@ static void free_pcppages_bulk(struct zone *zone, int count, page = list_entry(list->prev, struct page, lru); /* must delete as __free_one_page list manipulates */ list_del(&page->lru); - __free_one_page(page, zone, 0, migratetype); - trace_mm_page_pcpu_drain(page, 0, migratetype); + /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ + __free_one_page(page, zone, 0, page_private(page)); + trace_mm_page_pcpu_drain(page, 0, page_private(page)); } while (--count && --batch_free && !list_empty(list)); } spin_unlock(&zone->lock);