---

yaml --- r: 277318 b: refs/heads/master c: b79387e h: refs/heads/master v: v3
git-mirror · Dec 6, 2011 · 1db94c9 · 1db94c9
1 parent 25d8af2
commit 1db94c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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;