From: Peter Zijlstra <peterz@infradead.org>
Date: Fri, 26 Feb 2010 15:36:23 +0000 (+0100)
Subject: perf_event: Fix preempt warning in perf_clock()
X-Git-Tag: v2.6.34-rc1~262^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=24691ea964cc0123e386b661e03a86a481c6ee79;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 05b6c6b825e..aa6155b5e24 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());
 }
 
 /*