summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-11-22 17:21:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-11-26 19:43:42 +0000
commitaeb747afb3fb1f42d9c82615a103882f7f97f291 (patch)
treebf62b609f033b9293f78a3a0595ac3fdfcd54ae1 /arch/arm/kernel/traps.c
parentdc49cb21801db1f89d74b01a0f38f200aebb3e43 (diff)
downloadop-kernel-dev-aeb747afb3fb1f42d9c82615a103882f7f97f291.zip
op-kernel-dev-aeb747afb3fb1f42d9c82615a103882f7f97f291.tar.gz
[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/arm/kernel/traps.c')
-rw-r--r--arch/arm/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 4764bd9..5a52dd7 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;
}
}
OpenPOWER on IntegriCloud