From 7ad087a6ae2dc957ff0d79743a9e55f7698c71af Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 7 Oct 2012 20:35:18 +0000
Subject: [PATCH] --- yaml --- r: 334837 b: refs/heads/master c:
 31d2a638a91340d00502d397e558271f516b4f17 h: refs/heads/master i:   334835:
 e253d666788b718526131753487b4638328f45c3 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mm/alignment.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d2c5fae13c1d..41e70e261f7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05c769823cd0648fc56c8f0289c5f14d465389a8
+refs/heads/master: 31d2a638a91340d00502d397e558271f516b4f17
diff --git a/trunk/arch/arm/mm/alignment.c b/trunk/arch/arm/mm/alignment.c
index b9f60ebe3bc4..023f443784ec 100644
--- a/trunk/arch/arm/mm/alignment.c
+++ b/trunk/arch/arm/mm/alignment.c
@@ -856,8 +856,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 		if (thumb2_32b) {
 			offset.un = 0;
 			handler = do_alignment_t32_to_handler(&instr, regs, &offset);
-		} else
+		} else {
+			offset.un = 0;
 			handler = do_alignment_ldmstm;
+		}
 		break;
 
 	default: