lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Fix up legacy PMB mode offset calculation.

Browse Source 
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>
This commit is contained in:
Paul Mundt
2010-02-15 16:10:57 +09:00
parent 028c5d5d59
commit 04c8697355
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/sh/kernel/vmlinux.lds.S
View File

@@ -4,11 +4,9 @@
*/ */
#ifdef CONFIG_SUPERH64 #ifdef CONFIG_SUPERH64
#define LOAD_OFFSET PAGE_OFFSET #define LOAD_OFFSET PAGE_OFFSET
#define MEMORY_OFFSET __MEMORY_START
OUTPUT_ARCH(sh:sh5) OUTPUT_ARCH(sh:sh5)
#else #else
#define LOAD_OFFSET 0 #define LOAD_OFFSET 0
#define MEMORY_OFFSET 0
OUTPUT_ARCH(sh) OUTPUT_ARCH(sh)
#endif #endif
@@ -16,6 +14,13 @@ OUTPUT_ARCH(sh)
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/vmlinux.lds.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) ENTRY(_start)
SECTIONS SECTIONS
{ {