diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2010-02-26 16:36:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 17:25:00 +0100 |
| commit | 24691ea964cc0123e386b661e03a86a481c6ee79 (patch) | |
| tree | 3dbda94caa97b627dde488e968c937e3bbbc8fbc /kernel/perf_event.c | |
| parent | 4385d580f2278abab6d336e52522e9a6f5452a11 (diff) | |
| download | linux-24691ea964cc0123e386b661e03a86a481c6ee79.tar.bz2 | |
perf_event: Fix preempt warning in perf_clock()
A recent commit introduced a preemption warning for
perf_clock(), use raw_smp_processor_id() to avoid this, it
really doesn't matter which cpu we use here.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1267198583.22519.684.camel@laptop>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 05b6c6b825e3..aa6155b5e24c 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -249,7 +249,7 @@ static void perf_unpin_context(struct perf_event_context *ctx) static inline u64 perf_clock(void) { - return cpu_clock(smp_processor_id()); + return cpu_clock(raw_smp_processor_id()); } /* |