From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 9 Oct 2007 06:20:53 +0000 (+0900)
Subject: sh: Fix up some section alignments in linker script.
X-Git-Tag: v2.6.24-rc1~1377^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3497337946415849a2e4473ec2e9f0d2a6624b23;p=~emulex%2Finfiniband.git

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>
---

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 84a203b8573..3d16d6ef47e 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 = .;