---

yaml --- r: 334837 b: refs/heads/master c: 31d2a63 h: refs/heads/master i: 334835: e253d66 v: v3
git-mirror · Oct 9, 2012 · 7ad087a · 7ad087a
1 parent 7741a24
commit 7ad087a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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: