Patchwork powerpc: Explicit alignment for .data.cacheline_aligned

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date May 18, 2009, 4:29 a.m.
Message ID <20090518042904.95E0BDE064@ozlabs.org>
Download mbox | patch
Permalink /patch/27332/
State Superseded, archived
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Benjamin Herrenschmidt - May 18, 2009, 4:29 a.m.
I don't think anything guarantees that the objects in data.page_aligned
are a multiple of PAGE_SIZE, thus the section may end on any boundary.

So the following section, .data.cacheline_aligned needs an explicit
alignment.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

 arch/powerpc/kernel/vmlinux.lds.S |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

--- linux-work.orig/arch/powerpc/kernel/vmlinux.lds.S	2009-05-18 14:24:05.000000000 +1000
+++ linux-work/arch/powerpc/kernel/vmlinux.lds.S	2009-05-18 14:24:22.000000000 +1000
@@ -264,7 +264,8 @@  SECTIONS
 		*(.data.page_aligned)
 	}
 
-	.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
+	. = ALIGN(L1_CACHE_BYTES);
+	.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
 		*(.data.cacheline_aligned)
 	}