From 06dddc6623f842d066050fd6d7f41584a0ce93ce Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 20 May 2010 20:54:31 +0200
Subject: [PATCH] --- yaml --- r: 199128 b: refs/heads/master c:
 580d607cd666dfabfc1c7b0fb08c8ac690c7c87f h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0de457223844..5c839df829c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a94ffaaf55552769af328eaca9260fe6291c66c7
+refs/heads/master: 580d607cd666dfabfc1c7b0fb08c8ac690c7c87f
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index d25c864cadbf..e099650cd249 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -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))