linux-kernel - [tip:perf/core] perf_event: Fix preempt warning in perf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-24691ea964cc0123e386b661e03a86a481c6ee79@git.kernel.org>
Date:	Fri, 26 Feb 2010 16:27:34 GMT
From:	tip-bot for Peter Zijlstra <peterz@...radead.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	a.p.zijlstra@...llo.nl, stable@...nel.org, peterz@...radead.org,
	tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/core] perf_event: Fix preempt warning in perf_clock()

Commit-ID:  24691ea964cc0123e386b661e03a86a481c6ee79
Gitweb:     http://git.kernel.org/tip/24691ea964cc0123e386b661e03a86a481c6ee79
Author:     Peter Zijlstra <peterz@...radead.org>
AuthorDate: Fri, 26 Feb 2010 16:36:23 +0100
Committer:  Ingo Molnar <mingo@...e.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@...llo.nl>
LKML-Reference: <1267198583.22519.684.camel@...top>
Cc: <stable@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.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());
 }
 
 /*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/