X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-xtensa%2Fpage.h;fp=include%2Fasm-xtensa%2Fpage.h;h=8ded36f255a2847a12f629e38db3c3ab2dab0921;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=40f4c6c3f580fd830706e21d9405235a38801d92;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h
index 40f4c6c3f..8ded36f25 100644
--- a/include/asm-xtensa/page.h
+++ b/include/asm-xtensa/page.h
@@ -14,6 +14,7 @@
 #ifdef __KERNEL__
 
 #include <asm/processor.h>
+#include <linux/config.h>
 
 /*
  * PAGE_SHIFT determines the page size
@@ -108,7 +109,10 @@ 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)
-#ifdef CONFIG_DISCONTIGMEM
+#ifndef CONFIG_DISCONTIGMEM
+# define pfn_to_page(pfn)	(mem_map + (pfn))
+# define page_to_pfn(page)	((unsigned long)((page) - mem_map))
+#else
 # error CONFIG_DISCONTIGMEM not supported
 #endif
 
@@ -126,5 +130,4 @@ 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 */