From db6748eba0a1ed60020dfb85cb29115e516b89a4 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Sep 2008 18:14:50 +0900
Subject: [PATCH] --- yaml --- r: 116107 b: refs/heads/master c:
 247bc6d2ae3e2de08529977952c7d085f9d562d4 h: refs/heads/master i:   116105:
 4c37711bb77510052c1392e0f1d597b9a2758a51   116103:
 661e04df261ffe942181e05f34ff88646add0b54 v: v3

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

diff --git a/[refs] b/[refs]
index 043cbd6f12dc..9ab519908079 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee386de77419f9fedf206d84c4d4b2de0ead5bcb
+refs/heads/master: 247bc6d2ae3e2de08529977952c7d085f9d562d4
diff --git a/trunk/arch/sh/kernel/kprobes.c b/trunk/arch/sh/kernel/kprobes.c
index 75accf9b4209..f0e1c78d0bff 100644
--- a/trunk/arch/sh/kernel/kprobes.c
+++ b/trunk/arch/sh/kernel/kprobes.c
@@ -542,6 +542,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 		       MIN_STACK_SIZE(stack_addr));
 
 		kcb->kprobe_status = KPROBE_HIT_SS;
+		preempt_enable_no_resched();
 		return 1;
 	}
 	return 0;