---

yaml --- r: 42705 b: refs/heads/master c: 4d3eeea h: refs/heads/master i: 42703: c8c6753 v: v3
git-mirror · Dec 7, 2006 · 6feea1b · 6feea1b
1 parent 3590d8a
commit 6feea1b
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: e9c1528a429c831458e54c8701a0b80ba563a7a8
+refs/heads/master: 4d3eeeac97a6e4fc1ff3ad184f1c3bf328de7cb6
diff --git 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;
 }