diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-25 15:59:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-25 15:59:34 -0700 |
| commit | 6bb1e3819c08d640bc7e64fc522d7d8b1bc4d0b9 (patch) | |
| tree | cb75297aad394e172c02fc66037029fb64c590ba /arch/arm/mm | |
| parent | cff7b8ba60e332377568c3d55c8036e9b1de32e6 (diff) | |
| parent | b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f (diff) | |
| download | linux-3.10-6bb1e3819c08d640bc7e64fc522d7d8b1bc4d0b9.tar.gz linux-3.10-6bb1e3819c08d640bc7e64fc522d7d8b1bc4d0b9.tar.bz2 linux-3.10-6bb1e3819c08d640bc7e64fc522d7d8b1bc4d0b9.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"A random collection of various fixes, mainly from Arnd and a few other
people. Not thing really stands out here."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: drop experimental status for hotplug and Thumb2
ARM: 7560/1: SMP_TWD: use DIV_ROUND_CLOSEST() for periodic mode
ARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count
ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
ARM: 7555/1: kexec: fix segment memory addresses check
ARM: warnings in arch/arm/include/asm/uaccess.h
ARM: binfmt_flat: unused variable 'persistent'
ARM: be really quiet when building with 'make -s'
ARM: pass -marm to gcc by default for both C and assembler
ARM: Xen: fix initial build problems
ARM: export default read_current_timer
ARM: Fix another build warning in arch/arm/mm/alignment.c
ARM: export set_irq_flags
ARM: kprobes: make more tests conditional
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 b9f60ebe3bc..023f443784e 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: |