aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/include/asm/virtconvert.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
index f35229b8651d..b8a82fb1cef8 100644
--- a/arch/m68k/include/asm/virtconvert.h
+++ b/arch/m68k/include/asm/virtconvert.h
@@ -26,16 +26,12 @@ static inline void *phys_to_virt(unsigned long address)
26} 26}
27 27
28/* Permanent address of a page. */ 28/* Permanent address of a page. */
29#ifdef CONFIG_MMU 29#if defined(CONFIG_MMU) && defined(CONFIG_SINGLE_MEMORY_CHUNK)
30#ifdef CONFIG_SINGLE_MEMORY_CHUNK
31#define page_to_phys(page) \ 30#define page_to_phys(page) \
32 __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) 31 __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
33#else 32#else
34#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) 33#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
35#endif 34#endif
36#else
37#define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT)
38#endif
39 35
40/* 36/*
41 * IO bus memory addresses are 1:1 with the physical address, 37 * IO bus memory addresses are 1:1 with the physical address,