diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-08 20:30:10 +1000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:39:27 +0200 |
| commit | dc66270b51a62b1a6888d5309229e638a305c47b (patch) | |
| tree | bc73624524d4faadba9f05ec1db842466726072a /arch/powerpc/kernel | |
| parent | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (diff) | |
| download | blackbird-op-linux-dc66270b51a62b1a6888d5309229e638a305c47b.tar.gz blackbird-op-linux-dc66270b51a62b1a6888d5309229e638a305c47b.zip | |
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/kernel')
| -rw-r--r-- | arch/powerpc/kernel/perf_counter.c | 3 |
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) { 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); } |
