aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2009-04-08 06:30:10 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-08 06:39:27 -0400
commitdc66270b51a62b1a6888d5309229e638a305c47b (patch)
treebc73624524d4faadba9f05ec1db842466726072a /arch/powerpc
parent5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (diff)
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/perf_counter.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index f88c35d0710a..0e5651385ddc 100644
--- 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)
457{ 457{
458 counter->state = PERF_COUNTER_STATE_ACTIVE; 458 counter->state = PERF_COUNTER_STATE_ACTIVE;
459 counter->oncpu = cpu; 459 counter->oncpu = cpu;
460 counter->tstamp_running += counter->ctx->time_now - 460 counter->tstamp_running += counter->ctx->time - counter->tstamp_stopped;
461 counter->tstamp_stopped;
462 if (is_software_counter(counter)) 461 if (is_software_counter(counter))
463 counter->hw_ops->enable(counter); 462 counter->hw_ops->enable(counter);
464} 463}