---

yaml --- r: 116107 b: refs/heads/master c: 247bc6d h: refs/heads/master i: 116105: 4c37711 116103: 661e04d v: v3
git-mirror · Sep 8, 2008 · db6748e · db6748e
1 parent 3646cba
commit db6748e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;