From f2314fe44d2f80923a98da1dae29400a2067f229 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Mon, 27 Mar 2006 01:15:45 -0800
Subject: [PATCH] --- yaml --- r: 24298 b: refs/heads/master c:
 aed630434c4fc0bca8ed62f6730d44ba00bdf595 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/asm-s390/page.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d7ab2c5a3c5c..e7cc0af0b742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f68d4c996d3062c8fe64e3ed36d4c83d23288ad8
+refs/heads/master: aed630434c4fc0bca8ed62f6730d44ba00bdf595
diff --git a/trunk/include/asm-s390/page.h b/trunk/include/asm-s390/page.h
index 2430c561e021..3b1138ac7e79 100644
--- a/trunk/include/asm-s390/page.h
+++ b/trunk/include/asm-s390/page.h
@@ -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 */