diff --git a/[refs] b/[refs]
index cffc1118ec0b..dea5cbf08b9c 100644
--- 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
index f88c35d0710a..0e5651385ddc 100644
--- 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);
 }