[PATCH] unify pfn_to_page: mips pfn_to_page

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-mips/mmzone.h b/include/asm-mips/mmzone.h
index 011caebac369c842d8dd99541688b8295d04340a..7bde4432092b75c554d754b0213ad8423f1df2e4 100644 (file)
--- a/include/asm-mips/mmzone.h
+++ b/include/asm-mips/mmzone.h
@@ -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 --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index ee25a779bf4984f84d4ac7ed4b418299a3354c28..a1eab136ff6c7963a6dc2dde3b996db13e70bcda 100644 (file)
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -140,8 +140,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #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; } pgprot_t;
 #define WANT_PAGE_VIRTUAL
 #endif
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* _ASM_PAGE_H */