---

yaml
---
r: 169747
b: refs/heads/master
c: 6c2bfcb
h: refs/heads/master
i:
  169745: 4a8c1ed
  169743: c81cc14
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a66a3052e2d4c5815d7ad26887b1d4193206e691
+refs/heads/master: 6c2bfcbe58e0dd39554be88940149f5aa11e17d1

trunk/kernel/perf_event.c

@@ -447,9 +447,8 @@ static void perf_event_remove_from_context(struct perf_event *event)
 	 * can remove the event safely, if the call above did not
 	 * succeed.
 	 */
-	if (!list_empty(&event->group_entry)) {
+	if (!list_empty(&event->group_entry))
 		list_del_event(event, ctx);
-	}
 	spin_unlock_irq(&ctx->lock);
 }
 
@@ -1033,10 +1032,10 @@ void __perf_event_sched_out(struct perf_event_context *ctx,
 	update_context_time(ctx);
 
 	perf_disable();
-	if (ctx->nr_active)
+	if (ctx->nr_active) {
 		list_for_each_entry(event, &ctx->group_list, group_entry)
 			group_sched_out(event, cpuctx, ctx);
-
+	}
 	perf_enable();
  out:
 	spin_unlock(&ctx->lock);