From: Nicolas Pitre <nico@cam.org>
Date: Thu, 22 Nov 2007 16:21:27 +0000 (+0100)
Subject: [ARM] 4661/1: fix do_undefinstr wrt the enabling of IRQs
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=aeb747afb3fb1f42d9c82615a103882f7f97f291;p=powerpc.git

[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>
---

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 4764bd9cce..5a52dd7f97 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;
 			}
 		}