From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 13 Oct 2008 23:36:13 +0000 (-0700)
Subject: MIPS: Align .data.cacheline_aligned based on CONFIG_MIPS_L1_CACHE_SHIFT
X-Git-Tag: v2.6.28-rc1~564^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2dbac10263b2f3c561de68b4c369bc679352ccee;p=linux-2.6-omap-h63xx.git

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

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