aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-10-09 02:20:53 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-10-09 02:20:53 -0400
commit3497337946415849a2e4473ec2e9f0d2a6624b23 (patch)
tree963431a804ae441ca64c159f3e68379e6c998b1b /arch/sh
parent5d9df8eeacec943c9599f1cfd1069bc8cced3de6 (diff)
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')
-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
62 __nosave_end = .; 62 __nosave_end = .;
63 63
64 PERCPU(PAGE_SIZE) 64 PERCPU(PAGE_SIZE)
65
66 . = ALIGN(L1_CACHE_BYTES);
65 .data.cacheline_aligned : { *(.data.cacheline_aligned) } 67 .data.cacheline_aligned : { *(.data.cacheline_aligned) }
66 68
67 _edata = .; /* End of data section */ 69 _edata = .; /* End of data section */
@@ -90,6 +92,8 @@ SECTIONS
90 SECURITY_INIT 92 SECURITY_INIT
91 93
92#ifdef CONFIG_BLK_DEV_INITRD 94#ifdef CONFIG_BLK_DEV_INITRD
95 . = ALIGN(PAGE_SIZE);
96
93 __initramfs_start = .; 97 __initramfs_start = .;
94 .init.ramfs : { *(.init.ramfs) } 98 .init.ramfs : { *(.init.ramfs) }
95 __initramfs_end = .; 99 __initramfs_end = .;