From a22fabd8122ac456bebea692b5f7bbc4bed0f368 Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Thu, 11 Aug 2011 12:31:20 +0100
Subject: [PATCH] --- yaml --- r: 270124 b: refs/heads/master c:
 5f12a761937373d2f9b557d7519e6f1cf738b8f0 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/events/core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b7fb6fbc1524..b232f8b3602c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a505addc366525cd8d9358298be0dc8655be5953
+refs/heads/master: 5f12a761937373d2f9b557d7519e6f1cf738b8f0
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index b8785e26ee1c..68c8017de969 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -5715,6 +5715,7 @@ struct pmu *perf_init_event(struct perf_event *event)
 	pmu = idr_find(&pmu_idr, event->attr.type);
 	rcu_read_unlock();
 	if (pmu) {
+		event->pmu = pmu;
 		ret = pmu->event_init(event);
 		if (ret)
 			pmu = ERR_PTR(ret);
@@ -5722,6 +5723,7 @@ struct pmu *perf_init_event(struct perf_event *event)
 	}
 
 	list_for_each_entry_rcu(pmu, &pmus, entry) {
+		event->pmu = pmu;
 		ret = pmu->event_init(event);
 		if (!ret)
 			goto unlock;
@@ -5848,8 +5850,6 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
 		return ERR_PTR(err);
 	}
 
-	event->pmu = pmu;
-
 	if (!event->parent) {
 		if (event->attach_state & PERF_ATTACH_TASK)
 			jump_label_inc(&perf_sched_events);