diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 17:33:53 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 17:35:13 +0100 |
| commit | 7642e2b2138188d789b314b54033a1732f9d0736 (patch) | |
| tree | 4113c0922f3ef3c4f52d74a5dbf4206ea56a551c | |
| parent | 2e5f15f4c51efd5fdb1ea97380c38d3f8c32d3e9 (diff) | |
| download | lwn-7642e2b2138188d789b314b54033a1732f9d0736.tar.gz lwn-7642e2b2138188d789b314b54033a1732f9d0736.zip | |
perf: Use raw_smp_processor_id() in perf_clock()
perf_lock() can be called from preemptible contexts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -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 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()); } /* |