Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 223883
b: refs/heads/master
c: 6274de4
h: refs/heads/master
i:
  223881: 0b839d8
  223879: dca78b2
v: v3
  • Loading branch information
Masami Hiramatsu authored and Ingo Molnar committed Dec 6, 2010
1 parent eea8380 commit 8462665
Show file tree
Hide file tree
Showing 3 changed files with 238 additions and 78 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 61f4e13ffd85c037a942c5b7fd13f2b0c3162862
refs/heads/master: 6274de4984a630b45c6934b3ee62e5692c745328
4 changes: 4 additions & 0 deletions trunk/arch/x86/kernel/kprobes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1184,6 +1184,10 @@ static void __kprobes optimized_callback(struct optimized_kprobe *op,
{
struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();

/* This is possible if op is under delayed unoptimizing */
if (kprobe_disabled(&op->kp))
return;

preempt_disable();
if (kprobe_running()) {
kprobes_inc_nmissed_count(&op->kp);
Expand Down
Loading

0 comments on commit 8462665

Please sign in to comment.