From 6feea1bcfa62967e19ac1ec905006e4966288433 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 6 Dec 2006 20:33:54 -0800
Subject: [PATCH] --- yaml --- r: 42705 b: refs/heads/master c:
 4d3eeeac97a6e4fc1ff3ad184f1c3bf328de7cb6 h: refs/heads/master i:   42703:
 c8c67531fdc32b04889f8d058da5ec40f86c36c8 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/avr32/kernel/kprobes.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8cde7269c7c6..03ea56601ab2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9c1528a429c831458e54c8701a0b80ba563a7a8
+refs/heads/master: 4d3eeeac97a6e4fc1ff3ad184f1c3bf328de7cb6
diff --git a/trunk/arch/avr32/kernel/kprobes.c b/trunk/arch/avr32/kernel/kprobes.c
index ca41fc1edbe1..d0abbcaf1c1e 100644
--- a/trunk/arch/avr32/kernel/kprobes.c
+++ b/trunk/arch/avr32/kernel/kprobes.c
@@ -154,6 +154,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
 	return 1;
 
 no_kprobe:
+	preempt_enable_no_resched();
 	return ret;
 }