Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[firefly-linux-kernel-4.4.55.git] / arch / m68k / include / asm / page_offset.h

diff --git a/arch/m68k/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset.h
index 1780152d81dace541507110a04e4065f49fb3cdc..82626a8f1d0a951597718ae68852050be20a60a7 100644 (file)
--- a/arch/m68k/include/asm/page_offset.h
+++ b/arch/m68k/include/asm/page_offset.h
@@ -1,11 +1,9 @@
 /* This handles the memory map.. */
 
-#ifdef CONFIG_MMU
-#ifndef CONFIG_SUN3
-#define PAGE_OFFSET_RAW                0x00000000
-#else
+#if defined(CONFIG_RAMBASE)
+#define PAGE_OFFSET_RAW                CONFIG_RAMBASE
+#elif defined(CONFIG_SUN3)
 #define PAGE_OFFSET_RAW                0x0E000000
-#endif
 #else
-#define        PAGE_OFFSET_RAW         CONFIG_RAMBASE
+#define PAGE_OFFSET_RAW                0x00000000
 #endif