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

MIPS can use generic funcs.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-mips/mmzone.h |   14 --------------
 include/asm-mips/page.h   |    3 +--
 2 files changed, 1 insertion(+), 16 deletions(-)

diff -puN include/asm-mips/mmzone.h~unify-pfn_to_page-mips-pfn_to_page include/asm-mips/mmzone.h
--- devel/include/asm-mips/mmzone.h~unify-pfn_to_page-mips-pfn_to_page	2006-02-20 21:02:57.000000000 -0800
+++ devel-akpm/include/asm-mips/mmzone.h	2006-02-20 21:02:57.000000000 -0800
@@ -22,20 +22,6 @@
 		       NODE_DATA(__n)->node_spanned_pages) : 0);\
 })
 
-#define pfn_to_page(pfn)					\
-({								\
- 	unsigned long __pfn = (pfn);				\
-	pg_data_t *__pg = NODE_DATA(pfn_to_nid(__pfn));		\
-	__pg->node_mem_map + (__pfn - __pg->node_start_pfn);	\
-})
-
-#define page_to_pfn(p)						\
-({								\
-	struct page *__p = (p);					\
-	struct zone *__z = page_zone(__p);			\
-	((__p - __z->zone_mem_map) + __z->zone_start_pfn);	\
-})
-
 /* XXX: FIXME -- wli */
 #define kern_addr_valid(addr)	(0)
 
diff -puN include/asm-mips/page.h~unify-pfn_to_page-mips-pfn_to_page include/asm-mips/page.h
--- devel/include/asm-mips/page.h~unify-pfn_to_page-mips-pfn_to_page	2006-02-20 21:02:57.000000000 -0800
+++ devel-akpm/include/asm-mips/page.h	2006-02-20 21:02:57.000000000 -0800
@@ -140,8 +140,6 @@ typedef struct { unsigned long pgprot; }
 #define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)
 
 #ifndef CONFIG_NEED_MULTIPLE_NODES
-#define pfn_to_page(pfn)	(mem_map + (pfn))
-#define page_to_pfn(page)	((unsigned long)((page) - mem_map))
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
 #endif
 
@@ -160,6 +158,7 @@ typedef struct { unsigned long pgprot; }
 #define WANT_PAGE_VIRTUAL
 #endif
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* _ASM_PAGE_H */
_