perf_counter: fix powerpc build

Commit 4af4998b ("perf_counter: rework context time") changed struct
perf_counter_context to have a 'time' field instead of a 'time_now'
field, but neglected to fix the place in the powerpc perf_counter.c
where the time_now field was accessed.  This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <18908.31922.411398.147810@cargo.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index f88c35d0710a506c763ef7ddc996ee63f0f4a061..0e5651385ddc655f7335c990df3bc61210c96b7b 100644 (file)
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/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);
 }