diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-11-22 17:21:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-11-26 19:43:42 +0000 |
| commit | aeb747afb3fb1f42d9c82615a103882f7f97f291 (patch) | |
| tree | bf62b609f033b9293f78a3a0595ac3fdfcd54ae1 /arch | |
| parent | dc49cb21801db1f89d74b01a0f38f200aebb3e43 (diff) | |
| download | linux-aeb747afb3fb1f42d9c82615a103882f7f97f291.tar.gz linux-aeb747afb3fb1f42d9c82615a103882f7f97f291.tar.bz2 linux-aeb747afb3fb1f42d9c82615a103882f7f97f291.zip | |
[ARM] 4661/1: fix do_undefinstr wrt the enabling of IRQs
The lock is acquired with spin_lock_irqsave() and released in the
not-found case with spin_unlock_irqrestore().
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 4764bd9ccee8..5a52dd7f97fe 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -327,7 +327,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) if ((instr & hook->instr_mask) == hook->instr_val && (regs->ARM_cpsr & hook->cpsr_mask) == hook->cpsr_val) { if (hook->fn(regs, instr) == 0) { - spin_unlock_irq(&undef_lock); + spin_unlock_irqrestore(&undef_lock, flags); return; } } |