summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-09-08 18:14:50 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-09-08 18:14:50 +0900
commit247bc6d2ae3e2de08529977952c7d085f9d562d4 (patch)
tree067ed9925262cfaeb13fb853a1d7eea96ffbd5a0 /arch/sh/kernel
parentee386de77419f9fedf206d84c4d4b2de0ead5bcb (diff)
downloadkernel-crypto-247bc6d2ae3e2de08529977952c7d085f9d562d4.tar.gz
kernel-crypto-247bc6d2ae3e2de08529977952c7d085f9d562d4.tar.xz
kernel-crypto-247bc6d2ae3e2de08529977952c7d085f9d562d4.zip
sh: kprobes: Fix up a preemption imbalance on jprobe return.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r--arch/sh/kernel/kprobes.c1
1 files changed, 1 insertions, 0 deletions
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;