summaryrefslogtreecommitdiff
path: root/include/asm-i386/page.h
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2006-03-27 13:15:33 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 20:44:44 +0400
commitad658b385e6308066f9084a7ea01305b223cd3a0 (patch)
treef8f84bf79ade6e9e51dbd18434616e7f89b5c977 /include/asm-i386/page.h
parenta117e66ed45ac0569c039ea60bd7a9a61e031858 (diff)
downloadlinux-ad658b385e6308066f9084a7ea01305b223cd3a0.tar.xz
[PATCH] unify pfn_to_page: i386 pfn_to_page
i386 can use generic funcs. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/page.h')
-rw-r--r--include/asm-i386/page.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index 997ca5d17876..30f52a2263ba 100644
--- a/include/asm-i386/page.h
+++ b/include/asm-i386/page.h
@@ -126,8 +126,6 @@ extern int page_is_ram(unsigned long pagenr);
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
#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 /* CONFIG_FLATMEM */
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
@@ -141,6 +139,7 @@ extern int page_is_ram(unsigned long pagenr);
#endif /* __KERNEL__ */
+#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#endif /* _I386_PAGE_H */