[POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().

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

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