---

yaml --- r: 263645 b: refs/heads/master c: 7f310a5 h: refs/heads/master i: 263643: 71065dd v: v3
git-mirror · Aug 31, 2011 · f7eb6d7 · f7eb6d7
1 parent 79603f4
commit f7eb6d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8d757ef076f0f95f13a918808824058de25b3eb
+refs/heads/master: 7f310a5d4e8525ac0cc2f58c973d2100ce034410
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
@@ -3396,8 +3396,8 @@ static int perf_event_index(struct perf_event *event)
 }
 
 static void calc_timer_values(struct perf_event *event,
-				u64 *running,
-				u64 *enabled)
+				u64 *enabled,
+				u64 *running)
 {
 	u64 now, ctx_time;