Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 169755
b: refs/heads/master
c: fdf6bc9
h: refs/heads/master
i:
  169753: e122245
  169751: 0794a81
v: v3
  • Loading branch information
Frederic Weisbecker authored and Ingo Molnar committed Nov 23, 2009
1 parent 3013031 commit 69bd898
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 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: e6db4876575f3fdd5b1df2cbff826df95ab9af6a
refs/heads/master: fdf6bc95229821e3d9405eba28925b76e92b74d0
11 changes: 10 additions & 1 deletion trunk/kernel/hw_breakpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,16 @@ int __register_perf_hw_breakpoint(struct perf_event *bp)
if (ret)
return ret;

if (!bp->attr.disabled)
/*
* Ptrace breakpoints can be temporary perf events only
* meant to reserve a slot. In this case, it is created disabled and
* we don't want to check the params right now (as we put a null addr)
* But perf tools create events as disabled and we want to check
* the params for them.
* This is a quick hack that will be removed soon, once we remove
* the tmp breakpoints from ptrace
*/
if (!bp->attr.disabled || bp->callback == perf_bp_event)
ret = arch_validate_hwbkpt_settings(bp, bp->ctx->task);

return ret;
Expand Down

0 comments on commit 69bd898

Please sign in to comment.