From a16cd8c0bf64605b0a34d1e13312d7e90ff91df0 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Sat, 9 Apr 2011 21:17:47 +0200
Subject: [PATCH] --- yaml --- r: 257022 b: refs/heads/master c:
 e03a9a55b4e45377af9ca3d464135f9ea280b8f8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 75e6e83434f4..f64af89724ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dce5855bba5df9e87bb04584d505c1f1b103c652
+refs/heads/master: e03a9a55b4e45377af9ca3d464135f9ea280b8f8
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index 802f3b24eeef..c378062da277 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -2920,12 +2920,6 @@ int perf_event_release_kernel(struct perf_event *event)
 {
 	struct perf_event_context *ctx = event->ctx;
 
-	/*
-	 * Remove from the PMU, can't get re-enabled since we got
-	 * here because the last ref went.
-	 */
-	perf_event_disable(event);
-
 	WARN_ON_ONCE(ctx->parent_ctx);
 	/*
 	 * There are two ways this annotation is useful:
@@ -2942,8 +2936,8 @@ int perf_event_release_kernel(struct perf_event *event)
 	mutex_lock_nested(&ctx->mutex, SINGLE_DEPTH_NESTING);
 	raw_spin_lock_irq(&ctx->lock);
 	perf_group_detach(event);
-	list_del_event(event, ctx);
 	raw_spin_unlock_irq(&ctx->lock);
+	perf_remove_from_context(event);
 	mutex_unlock(&ctx->mutex);
 
 	free_event(event);