[PATCH] unify pfn_to_page: x86_64 pfn_to_page

x86_64 can use generic funcs.
For DISCONTIGMEM, CONFIG_OUT_OF_LINE_PFN_TO_PAGE is selected.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 15 deletions

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 1cb4aa241c8c..4310b4a311a5 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -334,6 +334,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
         def_bool y
         depends on NUMA
 
+config OUT_OF_LINE_PFN_TO_PAGE
+        def_bool y
+        depends on DISCONTIGMEM
+
 config NR_CPUS
         int "Maximum number of CPUs (2-256)"
         range 2 255
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 63c72641b737..4be82d6e2b48 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -377,21 +377,6 @@ EXPORT_SYMBOL(node_data);
  * Should do that.
  */
 
-/* Requires pfn_valid(pfn) to be true */
-struct page *pfn_to_page(unsigned long pfn)
-{
-        int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT);
-        return (pfn - node_start_pfn(nid)) + NODE_DATA(nid)->node_mem_map;
-}
-EXPORT_SYMBOL(pfn_to_page);
-
-unsigned long page_to_pfn(struct page *page)
-{
-        return (long)(((page) - page_zone(page)->zone_mem_map) +
-                      page_zone(page)->zone_start_pfn);
-}
-EXPORT_SYMBOL(page_to_pfn);
-
 int pfn_valid(unsigned long pfn)
 {
         unsigned nid;