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

s390 can use generic funcs.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-s390/page.h |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN include/asm-s390/page.h~unify-pfn_to_page-s390-pfn_to_page include/asm-s390/page.h
--- devel/include/asm-s390/page.h~unify-pfn_to_page-s390-pfn_to_page	2006-02-20 21:02:58.000000000 -0800
+++ devel-akpm/include/asm-s390/page.h	2006-02-20 21:02:58.000000000 -0800
@@ -181,8 +181,6 @@ page_get_storage_key(unsigned long addr)
 #define PAGE_OFFSET             0x0UL
 #define __pa(x)                 (unsigned long)(x)
 #define __va(x)                 (void *)(unsigned long)(x)
-#define pfn_to_page(pfn)	(mem_map + (pfn))
-#define page_to_pfn(page)	((unsigned long)((page) - mem_map))
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
@@ -193,6 +191,7 @@ page_get_storage_key(unsigned long addr)
 
 #endif /* __KERNEL__ */
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* _S390_PAGE_H */
_