aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-10-09 15:20:53 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-10-09 15:20:53 +0900
commit3497337946415849a2e4473ec2e9f0d2a6624b23 (patch)
tree963431a804ae441ca64c159f3e68379e6c998b1b /arch/sh/kernel/vmlinux.lds.S
parentsh: Fix SH-4 DMAC CHCR masking. (diff)
downloadlinux-dev-3497337946415849a2e4473ec2e9f0d2a6624b23.tar.xz
linux-dev-3497337946415849a2e4473ec2e9f0d2a6624b23.zip
sh: Fix up some section alignments in linker script.
With the PERCPU() macro introduction .data.cacheline_aligned was inhereting PAGE_SIZE alignment, fix that up for L1_CACHE_BYTES again. Likewise, the initramfs section wants PAGE_SIZE alignment. 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.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 84a203b8573d..3d16d6ef47e1 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -62,6 +62,8 @@ SECTIONS
__nosave_end = .;
PERCPU(PAGE_SIZE)
+
+ . = ALIGN(L1_CACHE_BYTES);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
_edata = .; /* End of data section */
@@ -90,6 +92,8 @@ SECTIONS
SECURITY_INIT
#ifdef CONFIG_BLK_DEV_INITRD
+ . = ALIGN(PAGE_SIZE);
+
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;