From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

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>
---

 arch/x86_64/Kconfig         |    4 ++++
 arch/x86_64/mm/numa.c       |   15 ---------------
 include/asm-x86_64/mmzone.h |    4 ----
 include/asm-x86_64/page.h   |    3 +--
 4 files changed, 5 insertions(+), 21 deletions(-)

diff -puN arch/x86_64/Kconfig~unify-pfn_to_page-x86_64-pfn_to_page arch/x86_64/Kconfig
--- devel/arch/x86_64/Kconfig~unify-pfn_to_page-x86_64-pfn_to_page	2006-02-27 20:58:49.000000000 -0800
+++ devel-akpm/arch/x86_64/Kconfig	2006-02-27 20:58:49.000000000 -0800
@@ -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 256
diff -puN arch/x86_64/mm/numa.c~unify-pfn_to_page-x86_64-pfn_to_page arch/x86_64/mm/numa.c
--- devel/arch/x86_64/mm/numa.c~unify-pfn_to_page-x86_64-pfn_to_page	2006-02-27 20:58:49.000000000 -0800
+++ devel-akpm/arch/x86_64/mm/numa.c	2006-02-27 20:58:49.000000000 -0800
@@ -392,21 +392,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;
diff -puN include/asm-x86_64/mmzone.h~unify-pfn_to_page-x86_64-pfn_to_page include/asm-x86_64/mmzone.h
--- devel/include/asm-x86_64/mmzone.h~unify-pfn_to_page-x86_64-pfn_to_page	2006-02-27 20:58:49.000000000 -0800
+++ devel-akpm/include/asm-x86_64/mmzone.h	2006-02-27 20:58:49.000000000 -0800
@@ -39,12 +39,8 @@ static inline __attribute__((pure)) int 
 #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT)
 #define kvaddr_to_nid(kaddr)	phys_to_nid(__pa(kaddr))
 
-extern struct page *pfn_to_page(unsigned long pfn);
-extern unsigned long page_to_pfn(struct page *page);
 extern int pfn_valid(unsigned long pfn);
 #endif
 
-#define local_mapnr(kvaddr) \
-	( (__pa(kvaddr) >> PAGE_SHIFT) - node_start_pfn(kvaddr_to_nid(kvaddr)) )
 #endif
 #endif
diff -puN include/asm-x86_64/page.h~unify-pfn_to_page-x86_64-pfn_to_page include/asm-x86_64/page.h
--- devel/include/asm-x86_64/page.h~unify-pfn_to_page-x86_64-pfn_to_page	2006-02-27 20:58:49.000000000 -0800
+++ devel-akpm/include/asm-x86_64/page.h	2006-02-27 20:58:49.000000000 -0800
@@ -123,8 +123,6 @@ typedef struct { unsigned long pgprot; }
 #define __boot_va(x)		__va(x)
 #define __boot_pa(x)		__pa(x)
 #ifdef CONFIG_FLATMEM
-#define pfn_to_page(pfn)	(mem_map + (pfn))
-#define page_to_pfn(page)	((unsigned long)((page) - mem_map))
 #define pfn_valid(pfn)		((pfn) < end_pfn)
 #endif
 
@@ -140,6 +138,7 @@ typedef struct { unsigned long pgprot; }
 
 #endif /* __KERNEL__ */
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* _X86_64_PAGE_H */
_