From 347acb238a9c344854896067f04ffdf36ca55a62 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 17 May 2009 18:29:03 +0000
Subject: [PATCH] --- yaml --- r: 145112 b: refs/heads/master c:
 0e337b42d620ca7c45fe64e64dd71957c56216c9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e1b03e4b76eb..6f2ab0a079fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc892288f42661a140124ecbf9d44850a95de222
+refs/heads/master: 0e337b42d620ca7c45fe64e64dd71957c56216c9
diff --git a/trunk/arch/powerpc/kernel/vmlinux.lds.S b/trunk/arch/powerpc/kernel/vmlinux.lds.S
index a047a6cfca4d..8ef8a14abc95 100644
--- a/trunk/arch/powerpc/kernel/vmlinux.lds.S
+++ b/trunk/arch/powerpc/kernel/vmlinux.lds.S
@@ -264,6 +264,7 @@ SECTIONS
 		*(.data.page_aligned)
 	}
 
+	. = ALIGN(L1_CACHE_BYTES);
 	.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
 		*(.data.cacheline_aligned)
 	}