summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2006-03-27 01:15:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 08:44:44 -0800
commit659e35051b165fb40f1160190c2d23f3d5c319d5 (patch)
tree2c102902c0c3be8b5bc005f11cf758203e0407f7
parentdc8ecb43701a78bd3c38e7fed1d1c76840579450 (diff)
downloadblackbird-op-linux-659e35051b165fb40f1160190c2d23f3d5c319d5.tar.gz
blackbird-op-linux-659e35051b165fb40f1160190c2d23f3d5c319d5.zip
[PATCH] unify pfn_to_page: powerpc pfn_to_page
PowerPC can use generic ones. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-powerpc/page.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h
index 0b82df483f7f..2fbecebe1c92 100644
--- a/include/asm-powerpc/page.h
+++ b/include/asm-powerpc/page.h
@@ -69,8 +69,6 @@
#endif
#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) < max_mapnr)
#endif
@@ -200,6 +198,7 @@ extern void copy_user_page(void *to, void *from, unsigned long vaddr,
struct page *p);
extern int page_is_ram(unsigned long pfn);
+#include <asm-generic/memory_model.h>
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
OpenPOWER on IntegriCloud