From: tip-bot for Peter Zijlstra <peterz@infradead.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
a.p.zijlstra@chello.nl, stable@kernel.org, peterz@infradead.org,
tglx@linutronix.de, mingo@elte.hu
Subject: [tip:perf/core] perf_event: Fix preempt warning in perf_clock()
Date: Fri, 26 Feb 2010 16:27:34 GMT [thread overview]
Message-ID: <tip-24691ea964cc0123e386b661e03a86a481c6ee79@git.kernel.org> (raw)
In-Reply-To: <1267198583.22519.684.camel@laptop>
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());
}
/*
prev parent reply other threads:[~2010-02-26 16:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-26 15:36 [PATCH] perf_event: Fix preempt warning in perf_clock() Peter Zijlstra
2010-02-26 16:27 ` tip-bot for Peter Zijlstra [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-24691ea964cc0123e386b661e03a86a481c6ee79@git.kernel.org \
--to=peterz@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=stable@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox