linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-xtensa / page.h

diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h
index 40f4c6c..8ded36f 100644 (file)
--- 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 */