From cff2a79b6929b900b24a8170ea162aa912a0b83a Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 9 Apr 2010 00:28:14 +0200
Subject: [PATCH] --- yaml --- r: 191195 b: refs/heads/master c:
 df8290bf7ea6b3051e2f315579a6e829309ec1ed h: refs/heads/master i:   191193:
 be2a6684e28b9989b8d36d4eae62851327d76d89   191191:
 953dc651c69052af8f7ebf8f0f5a7f826d2e5f08 v: v3

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

diff --git a/[refs] b/[refs]
index 3bd5873eb1c0..d03e25e1903b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76e1d9047e4edefb8ada20aa90d5762306082bd6
+refs/heads/master: df8290bf7ea6b3051e2f315579a6e829309ec1ed
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 9efdfe5b8d3b..095101d685bc 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -4164,15 +4164,8 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer)
 	perf_sample_data_init(&data, 0);
 	data.period = event->hw.last_period;
 	regs = get_irq_regs();
-	/*
-	 * In case we exclude kernel IPs or are somehow not in interrupt
-	 * context, provide the next best thing, the user IP.
-	 */
-	if ((event->attr.exclude_kernel || !regs) &&
-			!event->attr.exclude_user)
-		regs = task_pt_regs(current);
 
-	if (regs) {
+	if (regs && !perf_exclude_event(event, regs)) {
 		if (!(event->attr.exclude_idle && current->pid == 0))
 			if (perf_event_overflow(event, 0, &data, regs))
 				ret = HRTIMER_NORESTART;