linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-m32r/page.h b/include/asm-m32r/page.h
index 404a4c2..4ab5788 100644 (file)
--- a/include/asm-m32r/page.h
+++ b/include/asm-m32r/page.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_M32R_PAGE_H
 #define _ASM_M32R_PAGE_H
 
+#include <linux/config.h>
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT     12
@@ -75,7 +76,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #ifndef CONFIG_DISCONTIGMEM
 #define PFN_BASE               (CONFIG_MEMORY_START >> PAGE_SHIFT)
-#define ARCH_PFN_OFFSET                PFN_BASE
+#define pfn_to_page(pfn)       (mem_map + ((pfn) - PFN_BASE))
+#define page_to_pfn(page)      \
+       ((unsigned long)((page) - mem_map) + PFN_BASE)
 #define pfn_valid(pfn)         (((pfn) - PFN_BASE) < max_mapnr)
 #endif  /* !CONFIG_DISCONTIGMEM */
 
@@ -87,9 +90,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define devmem_is_allowed(x) 1
 
-#include <asm-generic/memory_model.h>
+#endif /* __KERNEL__ */
+
 #include <asm-generic/page.h>
 
-#endif /* __KERNEL__ */
 #endif /* _ASM_M32R_PAGE_H */