From a86963aa99e5741cb9180794dbc644a01b212004 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 11 May 2010 16:19:10 +0200
Subject: [PATCH] --- yaml --- r: 191346 b: refs/heads/master c:
 96c21a460a37880abfbc8445d5b098dbab958a29 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/perf_event.c | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index ee8d12d826e6..3b8548e1904d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 050735b08ca8a016bbace4445fa025b88fee770b
+refs/heads/master: 96c21a460a37880abfbc8445d5b098dbab958a29
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index c97e82518403..a4fa381db3c2 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -255,6 +255,18 @@ static void update_event_times(struct perf_event *event)
 	event->total_time_running = run_end - event->tstamp_running;
 }
 
+/*
+ * Update total_time_enabled and total_time_running for all events in a group.
+ */
+static void update_group_times(struct perf_event *leader)
+{
+	struct perf_event *event;
+
+	update_event_times(leader);
+	list_for_each_entry(event, &leader->sibling_list, group_entry)
+		update_event_times(event);
+}
+
 static struct list_head *
 ctx_group_list(struct perf_event *event, struct perf_event_context *ctx)
 {
@@ -320,7 +332,7 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
 	if (event->group_leader != event)
 		event->group_leader->nr_siblings--;
 
-	update_event_times(event);
+	update_group_times(event);
 
 	/*
 	 * If event was in error state, then keep it
@@ -501,18 +513,6 @@ static void perf_event_remove_from_context(struct perf_event *event)
 	raw_spin_unlock_irq(&ctx->lock);
 }
 
-/*
- * Update total_time_enabled and total_time_running for all events in a group.
- */
-static void update_group_times(struct perf_event *leader)
-{
-	struct perf_event *event;
-
-	update_event_times(leader);
-	list_for_each_entry(event, &leader->sibling_list, group_entry)
-		update_event_times(event);
-}
-
 /*
  * Cross CPU call to disable a performance event
  */