aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2010-02-26 10:36:23 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 12:06:14 -0400
commitfc0df425c936cca6e5a306c37b96bb1f8f15371c (patch)
tree88f075210165b461401bb655087bf2b18c52e7cf /kernel
parent5f376564288d2b6959bdd8bf5442872cb97c7ac1 (diff)
perf_event: Fix preempt warning in perf_clock()
commit 24691ea964cc0123e386b661e03a86a481c6ee79 upstream. 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> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 2ae7409bf38f..2fa4301ffadb 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -248,7 +248,7 @@ static void perf_unpin_context(struct perf_event_context *ctx)
248 248
249static inline u64 perf_clock(void) 249static inline u64 perf_clock(void)
250{ 250{
251 return cpu_clock(smp_processor_id()); 251 return cpu_clock(raw_smp_processor_id());
252} 252}
253 253
254/* 254/*