From 126f8695bd6d26ed6c3ba700e9bddcdc52ad5ee6 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 27 Apr 2011 04:24:57 +0200
Subject: [PATCH] --- yaml --- r: 245468 b: refs/heads/master c:
 749141d926faf23ef811686a8050e7cf13dc223f h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/tools/perf/util/parse-events.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 11b729e7f0f4..e6bfed47826e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceb53fbf6dbb1df26d38379a262c6981fe73dd36
+refs/heads/master: 749141d926faf23ef811686a8050e7cf13dc223f
diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c
index b686269427ea..b5bfef12f399 100644
--- a/trunk/tools/perf/util/parse-events.c
+++ b/trunk/tools/perf/util/parse-events.c
@@ -70,8 +70,8 @@ static const char *hw_event_names[] = {
 };
 
 static const char *sw_event_names[] = {
-	"cpu-clock-msecs",
-	"task-clock-msecs",
+	"cpu-clock",
+	"task-clock",
 	"page-faults",
 	"context-switches",
 	"CPU-migrations",