diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 02:10:57 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 02:10:57 -0500 |
commit | 04c869735541c27dd137c55f35f8a18bb372bbe1 (patch) | |
tree | d4dcd62d881afcb00c587640946ebbeb3c779d37 /arch/sh | |
parent | 028c5d5d596651bce13d06737eb3707a7e99a30c (diff) |
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>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/vmlinux.lds.S | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index dcf48915e2ea..0e66c7b30e0f 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S | |||
@@ -4,11 +4,9 @@ | |||
4 | */ | 4 | */ |
5 | #ifdef CONFIG_SUPERH64 | 5 | #ifdef CONFIG_SUPERH64 |
6 | #define LOAD_OFFSET PAGE_OFFSET | 6 | #define LOAD_OFFSET PAGE_OFFSET |
7 | #define MEMORY_OFFSET __MEMORY_START | ||
8 | OUTPUT_ARCH(sh:sh5) | 7 | OUTPUT_ARCH(sh:sh5) |
9 | #else | 8 | #else |
10 | #define LOAD_OFFSET 0 | 9 | #define LOAD_OFFSET 0 |
11 | #define MEMORY_OFFSET 0 | ||
12 | OUTPUT_ARCH(sh) | 10 | OUTPUT_ARCH(sh) |
13 | #endif | 11 | #endif |
14 | 12 | ||
@@ -16,6 +14,13 @@ OUTPUT_ARCH(sh) | |||
16 | #include <asm/cache.h> | 14 | #include <asm/cache.h> |
17 | #include <asm/vmlinux.lds.h> | 15 | #include <asm/vmlinux.lds.h> |
18 | 16 | ||
17 | #if defined(CONFIG_29BIT) || defined(CONFIG_SUPERH64) || \ | ||
18 | defined(CONFIG_PMB_LEGACY) | ||
19 | #define MEMORY_OFFSET __MEMORY_START | ||
20 | #else | ||
21 | #define MEMORY_OFFSET 0 | ||
22 | #endif | ||
23 | |||
19 | ENTRY(_start) | 24 | ENTRY(_start) |
20 | SECTIONS | 25 | SECTIONS |
21 | { | 26 | { |