From ed88a3ab9e224d51dcd1532abadb15126a285f8b Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 13 Oct 2008 16:36:13 -0700
Subject: [PATCH] --- yaml --- r: 114670 b: refs/heads/master c:
 2dbac10263b2f3c561de68b4c369bc679352ccee h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 68daeaada64b..20243bd93045 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e47c659b55aff703a2a28e8bd01ee64948eeb417
+refs/heads/master: 2dbac10263b2f3c561de68b4c369bc679352ccee
diff --git a/trunk/arch/mips/kernel/vmlinux.lds.S b/trunk/arch/mips/kernel/vmlinux.lds.S
index afb119f35682..58738c8d754f 100644
--- a/trunk/arch/mips/kernel/vmlinux.lds.S
+++ b/trunk/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)
 	}