From f4d6b39cc34911fabdec593995b4dbfecd6dac7d Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Thu, 22 Nov 2007 17:21:27 +0100
Subject: [PATCH] --- yaml --- r: 74401 b: refs/heads/master c:
 aeb747afb3fb1f42d9c82615a103882f7f97f291 h: refs/heads/master i:   74399:
 efdc25ef9bd6863c9ce837a256a97046f75ee30e v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/traps.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0b6ee33340bb..d5d59102496b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc49cb21801db1f89d74b01a0f38f200aebb3e43
+refs/heads/master: aeb747afb3fb1f42d9c82615a103882f7f97f291
diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c
index 4764bd9ccee8..5a52dd7f97fe 100644
--- a/trunk/arch/arm/kernel/traps.c
+++ b/trunk/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;
 			}
 		}