diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-22 23:56:09 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-22 23:56:09 +0200 |
| commit | b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f (patch) | |
| tree | 8832cbb308daf982830ddcbfd87644ae985d4151 /arch/arm/mm | |
| parent | ARM: drop experimental status for hotplug and Thumb2 (diff) | |
| parent | ARM: warnings in arch/arm/include/asm/uaccess.h (diff) | |
| download | linux-b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f.tar.xz linux-b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f.zip | |
Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/alignment.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index b9f60ebe3bc4..023f443784ec 100644 --- a/arch/arm/mm/alignment.c +++ b/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: |