From 1cf0ecec2eb72334c7e8fe68d227aca4560fc174 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 20 Jan 2012 12:01:09 +0100
Subject: [PATCH] --- yaml --- r: 286895 b: refs/heads/master c:
 972da06470519b6eaef9776a586e2353f089de9c h: refs/heads/master i:   286893:
 ee57083f5bffc2082db4e988b52e8bf2d63588ea   286891:
 afeb960f95a07780b01fc9022e227bdbe40f4411   286887:
 a58947a9f99929048a017a3b6163c7af599939bb   286879:
 b5ea6f52299bcff7a78e18cd108f2b49f42c3388 v: v3

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

diff --git a/[refs] b/[refs]
index 7f8d3fb4ee8e..4a1016eead02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0d5375e3c7b5d7f128af03c5271c328faeb3ae7
+refs/heads/master: 972da06470519b6eaef9776a586e2353f089de9c
diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S
index 1077e4ff6f3c..1e19691e0406 100644
--- a/trunk/arch/arm/kernel/vmlinux.lds.S
+++ b/trunk/arch/arm/kernel/vmlinux.lds.S
@@ -219,7 +219,7 @@ SECTIONS
 		/*
 		 * The exception fixup table (might need resorting at runtime)
 		 */
-		. = ALIGN(32);
+		. = ALIGN(4);
 		__start___ex_table = .;
 #ifdef CONFIG_MMU
 		*(__ex_table)