---

yaml --- r: 234466 b: refs/heads/master c: 768a06e h: refs/heads/master v: v3
git-mirror · Feb 23, 2011 · 8ef1199 · 8ef1199
1 parent 7f84d64
commit 8ef1199
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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);
 }