Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199128
b: refs/heads/master
c: 580d607
h: refs/heads/master
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed May 21, 2010
1 parent 697c202 commit 06dddc6
Show file tree
Hide file tree
Showing 2 changed files with 5 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: a94ffaaf55552769af328eaca9260fe6291c66c7
refs/heads/master: 580d607cd666dfabfc1c7b0fb08c8ac690c7c87f
5 changes: 4 additions & 1 deletion trunk/kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -4496,7 +4496,10 @@ static int perf_tp_event_match(struct perf_event *event,
struct perf_sample_data *data,
struct pt_regs *regs)
{
if (perf_exclude_event(event, regs))
/*
* All tracepoints are from kernel-space.
*/
if (event->attr.exclude_kernel)
return 0;

if (!perf_tp_filter_match(event, data))
Expand Down

0 comments on commit 06dddc6

Please sign in to comment.