From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Sep 2008 09:14:50 +0000 (+0900)
Subject: sh: kprobes: Fix up a preemption imbalance on jprobe return.
X-Git-Tag: v2.6.28-rc1~99^2~68
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=247bc6d2ae3e2de08529977952c7d085f9d562d4;p=linux-2.6-omap-h63xx.git

sh: kprobes: Fix up a preemption imbalance on jprobe return.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c
index 75accf9b420..f0e1c78d0bf 100644
--- a/arch/sh/kernel/kprobes.c
+++ b/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;