commit 2dbac10263b2f3c561de68b4c369bc679352ccee
author David Daney <ddaney@caviumnetworks.com> Mon Oct 13 16:36:13 2008 -0700
committer Ralf Baechle <ralf@linux-mips.org> Wed Oct 15 12:46:50 2008 +0100
tree 22e73fbdfadcc492b4aab4585788a712aa2598c9
parent e47c659b55aff703a2a28e8bd01ee64948eeb417

MIPS: Align .data.cacheline_aligned based on CONFIG_MIPS_L1_CACHE_SHIFT

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/vmlinux.lds.S

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index afb119f..58738c8 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -104,7 +104,7 @@
 	. = ALIGN(_PAGE_SIZE);
 	__nosave_end = .;
 
-	. = ALIGN(32);
+	. = ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT);
 	.data.cacheline_aligned : {
 		*(.data.cacheline_aligned)
 	}