From 1db94c9f68d523ee8890a7aee1bb131c23a1063a Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 22 Nov 2011 11:25:43 +0100
Subject: [PATCH] --- yaml --- r: 277318 b: refs/heads/master c:
 b79387ef185af2323594920923cecba5753c3817 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 e7be34d761f4..5ff8e7190263 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d9b482e78d3b16f97f85a82849f82db7eed3102
+refs/heads/master: b79387ef185af2323594920923cecba5753c3817
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index eeda5403590c..3c1541d7a53d 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -2497,13 +2497,7 @@ static void perf_event_enable_on_exec(struct perf_event_context *ctx)
 	raw_spin_lock(&ctx->lock);
 	task_ctx_sched_out(ctx);
 
-	list_for_each_entry(event, &ctx->pinned_groups, group_entry) {
-		ret = event_enable_on_exec(event, ctx);
-		if (ret)
-			enabled = 1;
-	}
-
-	list_for_each_entry(event, &ctx->flexible_groups, group_entry) {
+	list_for_each_entry(event, &ctx->event_list, event_entry) {
 		ret = event_enable_on_exec(event, ctx);
 		if (ret)
 			enabled = 1;