---

yaml --- r: 147342 b: refs/heads/master c: dc66270 h: refs/heads/master v: v3
git-mirror · Apr 8, 2009 · b85756f · b85756f
1 parent 99e3460
commit b85756f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789
+refs/heads/master: dc66270b51a62b1a6888d5309229e638a305c47b
diff --git a/trunk/arch/powerpc/kernel/perf_counter.c b/trunk/arch/powerpc/kernel/perf_counter.c
@@ -457,8 +457,7 @@ static void counter_sched_in(struct perf_counter *counter, int cpu)
 {
 	counter->state = PERF_COUNTER_STATE_ACTIVE;
 	counter->oncpu = cpu;
-	counter->tstamp_running += counter->ctx->time_now -
-		counter->tstamp_stopped;
+	counter->tstamp_running += counter->ctx->time - counter->tstamp_stopped;
 	if (is_software_counter(counter))
 		counter->hw_ops->enable(counter);
 }