From 8ef119923ab87ebae698ddb393ec65d1009e6e92 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 22 Feb 2011 16:52:24 +0100
Subject: [PATCH] --- yaml --- r: 234466 b: refs/heads/master c:
 768a06e2ca49cdf72389208cfc056a36cf8bc5e3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c9428e6a3247..cfdba43b8ff8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f7cce3c18188a067d463749168bdda5abc5b0f7
+refs/heads/master: 768a06e2ca49cdf72389208cfc056a36cf8bc5e3
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index dadeaea4b3fc..64a018e94fca 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -5810,16 +5810,9 @@ static void task_clock_event_del(struct perf_event *event, int flags)
 
 static void task_clock_event_read(struct perf_event *event)
 {
-	u64 time;
-
-	if (!in_nmi()) {
-		update_context_time(event->ctx);
-		time = event->ctx->time;
-	} else {
-		u64 now = perf_clock();
-		u64 delta = now - event->ctx->timestamp;
-		time = event->ctx->time + delta;
-	}
+	u64 now = perf_clock();
+	u64 delta = now - event->ctx->timestamp;
+	u64 time = event->ctx->time + delta;
 
 	task_clock_event_update(event, time);
 }