From f7eb6d7ff429d77e3e5d3197b18a7030047bf54b Mon Sep 17 00:00:00 2001
From: Eric B Munson <emunson@mgebm.net>
Date: Thu, 23 Jun 2011 16:34:38 -0400
Subject: [PATCH] --- yaml --- r: 263645 b: refs/heads/master c:
 7f310a5d4e8525ac0cc2f58c973d2100ce034410 h: refs/heads/master i:   263643:
 71065dd87605b8378651f7f6675e95fd77f745d2 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/events/core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 700924da61f6..62845d3ebd12 100644
--- 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
index 45847fbb599a..0f857782d06f 100644
--- 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;