Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
index 22ab05c9c52b..f35229b8651d 100644
--- a/arch/m68k/include/asm/virtconvert.h
+++ b/arch/m68k/include/asm/virtconvert.h
@@ -26,16 +26,15 @@ static inline void *phys_to_virt(unsigned long address)
 }
 
 /* Permanent address of a page. */
+#ifdef CONFIG_MMU
 #ifdef CONFIG_SINGLE_MEMORY_CHUNK
 #define page_to_phys(page) \
         __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
 #else
-#define page_to_phys(_page) ({                                          \
-        struct page *__page = _page;                                    \
-        struct pglist_data *pgdat;                                      \
-        pgdat = pg_data_table[page_to_nid(__page)];                     \
-        page_to_pfn(__page) << PAGE_SHIFT;                              \
-})
+#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
+#endif
+#else
+#define page_to_phys(page)      (((page) - mem_map) << PAGE_SHIFT)
 #endif
 
 /*