summaryrefslogtreecommitdiffstats
path: root/include/asm-xtensa
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki2006-03-27 11:15:52 +0200
committerLinus Torvalds2006-03-27 18:44:47 +0200
commit655a0443470a73d5dc36e974a241e8db59bb1ccb (patch)
tree1d6926f0bf49b48e02d106c6afb779b6502721fc /include/asm-xtensa
parent[PATCH] unify pfn_to_page: v850 pfn_to_page (diff)
downloadkernel-qcow2-linux-655a0443470a73d5dc36e974a241e8db59bb1ccb.tar.gz
kernel-qcow2-linux-655a0443470a73d5dc36e974a241e8db59bb1ccb.tar.xz
kernel-qcow2-linux-655a0443470a73d5dc36e974a241e8db59bb1ccb.zip
[PATCH] unify pfn_to_page: xtensa pfn_to_page
xtensa can use generic funcs. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-xtensa')
-rw-r--r--include/asm-xtensa/page.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h
index 8ded36f255a2..992bac5c1258 100644
--- a/include/asm-xtensa/page.h
+++ b/include/asm-xtensa/page.h
@@ -109,10 +109,7 @@ void copy_user_page(void *to,void* from,unsigned long vaddr,struct page* page);
#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
#define pfn_valid(pfn) ((unsigned long)pfn < max_mapnr)
-#ifndef CONFIG_DISCONTIGMEM
-# define pfn_to_page(pfn) (mem_map + (pfn))
-# define page_to_pfn(page) ((unsigned long)((page) - mem_map))
-#else
+#ifdef CONFIG_DISCONTIGMEM
# error CONFIG_DISCONTIGMEM not supported
#endif
@@ -130,4 +127,5 @@ void copy_user_page(void *to,void* from,unsigned long vaddr,struct page* page);
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#endif /* __KERNEL__ */
+#include <asm-generic/memory_model.h>
#endif /* _XTENSA_PAGE_H */