From 04c869735541c27dd137c55f35f8a18bb372bbe1 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 15 Feb 2010 16:10:57 +0900
Subject: sh: Fix up legacy PMB mode offset calculation.

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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index dcf48915e2e..0e66c7b30e0 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -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
 {
-- 
cgit v1.2.3