From 415bc06624e6cfb81d395b6b4e2ae7be20e9c011 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Tue, 6 Jan 2009 14:40:29 -0800
Subject: [PATCH] --- yaml --- r: 126257 b: refs/heads/master c:
 9f572e3f96b8a2ef70dcb881e64c7b9c10057d98 h: refs/heads/master i:   126255:
 c745e69eefc63f75aa2b1c5db2bb1556aadf9315 v: v3

---
 [refs]                                   |  2 +-
 trunk/include/asm-generic/memory_model.h |  7 -------
 trunk/mm/page_alloc.c                    | 13 -------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 7e52a81db097..87b2b3504d21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 901608d9045146aec6f14a7777ea4b1501c379f0
+refs/heads/master: 9f572e3f96b8a2ef70dcb881e64c7b9c10057d98
diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h
index 36fa286adad5..4c8d0afae711 100644
--- a/trunk/include/asm-generic/memory_model.h
+++ b/trunk/include/asm-generic/memory_model.h
@@ -69,15 +69,8 @@
 })
 #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */
 
-#ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE
-struct page;
-/* this is useful when inlined pfn_to_page is too big */
-extern struct page *pfn_to_page(unsigned long pfn);
-extern unsigned long page_to_pfn(struct page *page);
-#else
 #define page_to_pfn __page_to_pfn
 #define pfn_to_page __pfn_to_page
-#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index d531e8ef9984..7bf22e045318 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -4587,19 +4587,6 @@ void *__init alloc_large_system_hash(const char *tablename,
 	return table;
 }
 
-#ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE
-struct page *pfn_to_page(unsigned long pfn)
-{
-	return __pfn_to_page(pfn);
-}
-unsigned long page_to_pfn(struct page *page)
-{
-	return __page_to_pfn(page);
-}
-EXPORT_SYMBOL(pfn_to_page);
-EXPORT_SYMBOL(page_to_pfn);
-#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
-
 /* Return a pointer to the bitmap storing bits affecting a block of pages */
 static inline unsigned long *get_pageblock_bitmap(struct zone *zone,
 							unsigned long pfn)