aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2009-06-13 03:06:50 -0400
committerIngo Molnar <mingo@elte.hu>2009-06-13 06:58:24 -0400
commit87847b8f26cc7176ec9b239898dc7ce47a94e1a6 (patch)
tree12742fdb5a0569b6b5f6502fabb831314a9431a2
parent971738f3669092dd247eaf89658f2685180492a0 (diff)
perf_counter: Fix atomic_set vs. atomic64_t type mismatch
Using atomic_set on an atomic64_t variable gives a compiler warning on powerpc, and won't give the desired result at runtime. This fixes an instance of this error in the perf_counter code. Signed-off-by: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <18995.20490.979429.244883@cargo.ozlabs.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/perf_counter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 29b685f551aa..8d14a733f222 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1283,7 +1283,7 @@ static void perf_ctx_adjust_freq(struct perf_counter_context *ctx)
1283 if (!interrupts) { 1283 if (!interrupts) {
1284 perf_disable(); 1284 perf_disable();
1285 counter->pmu->disable(counter); 1285 counter->pmu->disable(counter);
1286 atomic_set(&hwc->period_left, 0); 1286 atomic64_set(&hwc->period_left, 0);
1287 counter->pmu->enable(counter); 1287 counter->pmu->enable(counter);
1288 perf_enable(); 1288 perf_enable();
1289 } 1289 }