]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 4661/1: fix do_undefinstr wrt the enabling of IRQs
authorNicolas Pitre <nico@cam.org>
Thu, 22 Nov 2007 16:21:27 +0000 (17:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 26 Nov 2007 19:43:42 +0000 (19:43 +0000)
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>
arch/arm/kernel/traps.c

index 4764bd9ccee801ced5838d9043a5923c9e931cb8..5a52dd7f97febbb49d7411e5a67fc830e4592c8a 100644 (file)
@@ -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;
                        }
                }