diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
| commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
| tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /arch/sh/kernel/vmlinux_32.lds.S | |
| parent | 93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'arch/sh/kernel/vmlinux_32.lds.S')
| -rw-r--r-- | arch/sh/kernel/vmlinux_32.lds.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S index 7b4b82bd1156..d0b2a715cd14 100644 --- a/arch/sh/kernel/vmlinux_32.lds.S +++ b/arch/sh/kernel/vmlinux_32.lds.S | |||
| @@ -15,7 +15,10 @@ OUTPUT_ARCH(sh) | |||
| 15 | ENTRY(_start) | 15 | ENTRY(_start) |
| 16 | SECTIONS | 16 | SECTIONS |
| 17 | { | 17 | { |
| 18 | #ifdef CONFIG_32BIT | 18 | #ifdef CONFIG_PMB_FIXED |
| 19 | . = CONFIG_PAGE_OFFSET + (CONFIG_MEMORY_START & 0x1fffffff) + | ||
| 20 | CONFIG_ZERO_PAGE_OFFSET; | ||
| 21 | #elif defined(CONFIG_32BIT) | ||
| 19 | . = CONFIG_PAGE_OFFSET + CONFIG_ZERO_PAGE_OFFSET; | 22 | . = CONFIG_PAGE_OFFSET + CONFIG_ZERO_PAGE_OFFSET; |
| 20 | #else | 23 | #else |
| 21 | . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET; | 24 | . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET; |