[PATCH] perf_event: Fix preempt warning in perf_clock()

[PATCH] perf_event: Fix preempt warning in perf_clock()

[Peter Zijlstra]

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>
CC: stable@kernel.org
LKML-Reference: <new-submission>
---
Index: linux-2.6/kernel/perf_event.c
===================================================================
--- linux-2.6.orig/kernel/perf_event.c
+++ linux-2.6/kernel/perf_event.c
@@ -249,7 +249,7 @@ static void perf_unpin_context(struct pe
 
 static inline u64 perf_clock(void)
 {
-	return cpu_clock(smp_processor_id());
+	return cpu_clock(raw_smp_processor_id());
 }
 
 /*

[tip:perf/core] perf_event: Fix preempt warning in perf_clock()

[tip-bot for Peter Zijlstra]

Commit-ID:  24691ea964cc0123e386b661e03a86a481c6ee79
Gitweb:     http://git.kernel.org/tip/24691ea964cc0123e386b661e03a86a481c6ee79
Author:     Peter Zijlstra <peterz@infradead.org>
AuthorDate: Fri, 26 Feb 2010 16:36:23 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 26 Feb 2010 17:25:00 +0100

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>
---
 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 05b6c6b..aa6155b 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());
 }
 
 /*