OSDN Git Service

sh: Fix up legacy PMB mode offset calculation.
authorPaul Mundt <lethal@linux-sh.org>
Mon, 15 Feb 2010 07:10:57 +0000 (16:10 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 15 Feb 2010 07:10:57 +0000 (16:10 +0900)
The change for fixing up sh64 inadvertently inverted the logic for legacy
PMB, fix that back up.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/kernel/vmlinux.lds.S

index dcf4891..0e66c7b 100644 (file)
@@ -4,11 +4,9 @@
  */
 #ifdef CONFIG_SUPERH64
 #define LOAD_OFFSET    PAGE_OFFSET
-#define MEMORY_OFFSET  __MEMORY_START
 OUTPUT_ARCH(sh:sh5)
 #else
 #define LOAD_OFFSET    0
-#define MEMORY_OFFSET  0
 OUTPUT_ARCH(sh)
 #endif
 
@@ -16,6 +14,13 @@ OUTPUT_ARCH(sh)
 #include <asm/cache.h>
 #include <asm/vmlinux.lds.h>
 
+#if defined(CONFIG_29BIT) || defined(CONFIG_SUPERH64) || \
+    defined(CONFIG_PMB_LEGACY)
+ #define MEMORY_OFFSET __MEMORY_START
+#else
+ #define MEMORY_OFFSET  0
+#endif
+
 ENTRY(_start)
 SECTIONS
 {