From db3691c5a54185087e1700e32f8cd138250efe14 Mon Sep 17 00:00:00 2001
From: Li Hong <lihong.hi@gmail.com>
Date: Fri, 5 Mar 2010 13:41:54 -0800
Subject: [PATCH] --- yaml --- r: 186199 b: refs/heads/master c:
 fc91668eaf9e7ba61e867fc2218b7e9fb67faa4f h: refs/heads/master i:   186197:
 ec3efb519d507c49161f3d3c07e38bdc7f9e53ae   186195:
 72905dd6fa61560eba42a2acedfab2b2625edb22   186191:
 e60fd89bfcf503779bf1e2fd235c2d55fd2cbfad v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/gfp.h |  2 +-
 trunk/mm/page_alloc.c     | 10 +++-------
 trunk/mm/swap.c           |  2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 46c2326bb81c..8ca59c721fc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c475dab63ae798d81fb597a6a1859986b296d9d0
+refs/heads/master: fc91668eaf9e7ba61e867fc2218b7e9fb67faa4f
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 557bdad320b6..e5567e6762f3 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -325,7 +325,7 @@ void free_pages_exact(void *virt, size_t size);
 
 extern void __free_pages(struct page *page, unsigned int order);
 extern void free_pages(unsigned long addr, unsigned int order);
-extern void free_hot_page(struct page *page);
+extern void free_hot_cold_page(struct page *page, int cold);
 
 #define __free_page(page) __free_pages((page), 0)
 #define free_page(addr) free_pages((addr),0)
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index caa7df60a4a1..80bcee0c5034 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1074,8 +1074,9 @@ void mark_free_pages(struct zone *zone)
 
 /*
  * Free a 0-order page
+ * cold == 1 ? free a cold page : free a hot page
  */
-static void free_hot_cold_page(struct page *page, int cold)
+void free_hot_cold_page(struct page *page, int cold)
 {
 	struct zone *zone = page_zone(page);
 	struct per_cpu_pages *pcp;
@@ -1135,11 +1136,6 @@ static void free_hot_cold_page(struct page *page, int cold)
 	local_irq_restore(flags);
 }
 
-void free_hot_page(struct page *page)
-{
-	free_hot_cold_page(page, 0);
-}
-	
 /*
  * split_page takes a non-compound higher-order page, and splits it into
  * n (1<<order) sub-pages: page[0..n]
@@ -2010,7 +2006,7 @@ void __free_pages(struct page *page, unsigned int order)
 {
 	if (put_page_testzero(page)) {
 		if (order == 0)
-			free_hot_page(page);
+			free_hot_cold_page(page, 0);
 		else
 			__free_pages_ok(page, order);
 	}
diff --git a/trunk/mm/swap.c b/trunk/mm/swap.c
index 308e57d8d7ed..9036b89813ac 100644
--- a/trunk/mm/swap.c
+++ b/trunk/mm/swap.c
@@ -55,7 +55,7 @@ static void __page_cache_release(struct page *page)
 		del_page_from_lru(zone, page);
 		spin_unlock_irqrestore(&zone->lru_lock, flags);
 	}
-	free_hot_page(page);
+	free_hot_cold_page(page, 0);
 }
 
 static void put_compound_page(struct page *page)