From c87ca1251484f3ba739dce6200abc8c316886e81 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 9 Oct 2007 15:20:53 +0900
Subject: [PATCH] --- yaml --- r: 68302 b: refs/heads/master c:
 3497337946415849a2e4473ec2e9f0d2a6624b23 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sh/kernel/vmlinux.lds.S | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1fe0a5a4a084..ac5ddde81aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d9df8eeacec943c9599f1cfd1069bc8cced3de6
+refs/heads/master: 3497337946415849a2e4473ec2e9f0d2a6624b23
diff --git a/trunk/arch/sh/kernel/vmlinux.lds.S b/trunk/arch/sh/kernel/vmlinux.lds.S
index 84a203b8573d..3d16d6ef47e1 100644
--- a/trunk/arch/sh/kernel/vmlinux.lds.S
+++ b/trunk/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 = .;