From fde6b1d21c69cacc29c2e7cf880fd4fa24253089 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 16 Jun 2009 15:32:14 -0700
Subject: [PATCH] --- yaml --- r: 151543 b: refs/heads/master c:
 974709bdb2a34db378fc84140220f363f558d0d6 h: refs/heads/master i:   151541:
 a85fc60971e238b07b0ef3d2544daf82acfc577c   151539:
 fe0e11a5887e9537818264cd56b7ff752f14625e   151535:
 972f1290896c8d5e252558bb8b212a1140a2b5ac v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44dfc2652a25..e7d3e162b157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2260e6b1f4eba0f5b5906795117791b5c660154
+refs/heads/master: 974709bdb2a34db378fc84140220f363f558d0d6
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index d56e377ad085..e60e41474332 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1030,6 +1030,7 @@ static void free_hot_cold_page(struct page *page, int cold)
 	kernel_map_pages(page, 1, 0);
 
 	pcp = &zone_pcp(zone, get_cpu())->pcp;
+	set_page_private(page, get_pageblock_migratetype(page));
 	local_irq_save(flags);
 	if (unlikely(clearMlocked))
 		free_page_mlock(page);
@@ -1039,7 +1040,6 @@ static void free_hot_cold_page(struct page *page, int cold)
 		list_add_tail(&page->lru, &pcp->list);
 	else
 		list_add(&page->lru, &pcp->list);
-	set_page_private(page, get_pageblock_migratetype(page));
 	pcp->count++;
 	if (pcp->count >= pcp->high) {
 		free_pages_bulk(zone, pcp->batch, &pcp->list, 0);