---

yaml --- r: 181199 b: refs/heads/master c: 04c8697 h: refs/heads/master i: 181197: 4e58635 181195: 64b7e21 181191: 9c6d6f6 181183: f03fe63 v: v3
git-mirror · Feb 15, 2010 · 20388e1 · 20388e1
1 parent 729c8ed
commit 20388e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -4,18 +4,23 @@
  */
 #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
 
 #include <asm/thread_info.h>
 #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
 {