summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-02-16 13:43:38 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-02-16 13:43:38 +0100
commit1d5cfcdff793e2f34ec61d902fa5ee0c7e4a2208 (patch)
tree8fc4a0dfd67aa995480c1a9b7e248c9793720efc /arch/sh/kernel/vmlinux.lds.S
parentsh: Merge the legacy PMB mapping and entry synchronization code. (diff)
downloadlinux-1d5cfcdff793e2f34ec61d902fa5ee0c7e4a2208.tar.xz
linux-1d5cfcdff793e2f34ec61d902fa5ee0c7e4a2208.zip
sh: Kill off some superfluous legacy PMB special casing.
The __va()/__pa() offsets and the boot memory offsets are consistent for all PMB users, so there is no need to special case these for legacy PMB. Kill the special casing off and depend on CONFIG_PMB across the board. This also fixes up yet another addressing bug for sh64. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/vmlinux.lds.S')
-rw-r--r--arch/sh/kernel/vmlinux.lds.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 0e66c7b30e0f..7f8a709c3ada 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -14,11 +14,10 @@ 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
+#ifdef CONFIG_PMB
+ #define MEMORY_OFFSET 0
#else
- #define MEMORY_OFFSET 0
+ #define MEMORY_OFFSET __MEMORY_START
#endif
ENTRY(_start)