From 7642e2b2138188d789b314b54033a1732f9d0736 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 24 Feb 2010 17:33:53 +0100 Subject: perf: Use raw_smp_processor_id() in perf_clock() perf_lock() can be called from preemptible contexts. Signed-off-by: Thomas Gleixner --- kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index ee1d0ab81129..21c76ea784fe 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) static inline u64 perf_clock(void) { - return cpu_clock(smp_processor_id()); + return cpu_clock(raw_smp_processor_id()); } /* -- cgit v1.2.3