From 20388e14924a8272134d8eec4cd5933d48459b16 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 15 Feb 2010 16:10:57 +0900
Subject: [PATCH] --- yaml --- r: 181199 b: refs/heads/master c:
 04c869735541c27dd137c55f35f8a18bb372bbe1 h: refs/heads/master i:   181197:
 4e58635ffd020904a5e1bbe06e97d9474ac3f09a   181195:
 64b7e21432cc4cd298a1ba69c962f04330b9c8a0   181191:
 9c6d6f67e9b037a25f24164c9619473ef4628672   181183:
 f03fe63397bd88c89c5d738ff992a67d65f85f02 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sh/kernel/vmlinux.lds.S | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47fd2147d972..579f17cd3a68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 028c5d5d596651bce13d06737eb3707a7e99a30c
+refs/heads/master: 04c869735541c27dd137c55f35f8a18bb372bbe1
diff --git a/trunk/arch/sh/kernel/vmlinux.lds.S b/trunk/arch/sh/kernel/vmlinux.lds.S
index dcf48915e2ea..0e66c7b30e0f 100644
--- a/trunk/arch/sh/kernel/vmlinux.lds.S
+++ b/trunk/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
 {