diff --git a/[refs] b/[refs]
index 40f52d0bf791..3342d4d6d38b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc013a88906bad9d2832d6316de1c7dbc1c2a794
+refs/heads/master: 38a398572fa2d8124f7479e40db581b5b72719c9
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 7c777a0da17a..c32bfa8e7f1e 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -326,7 +326,6 @@ 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_cold_page(struct page *page);
 
 #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 20759803a64a..913a8ebd3a8e 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1079,11 +1079,6 @@ void free_hot_page(struct page *page)
 	free_hot_cold_page(page, 0);
 }
 	
-void free_cold_page(struct page *page)
-{
-	free_hot_cold_page(page, 1);
-}
-
 /*
  * split_page takes a non-compound higher-order page, and splits it into
  * n (1<<order) sub-pages: page[0..n]