[tip:perf/core] perf, x86: P4_pmu_schedule_events -- use smp_processor_id instead of raw_
in [Kernel]
|
Prev: x86,perf: P4 PMU -- prepare header for user-space inclusion
Next: [tip:perf/core] perf, x86: P4 PMU -- add missing bit in CCCR mask
From: tip-bot for Cyrill Gorcunov on 19 May 2010 04:00 Commit-ID: 9d36dfcf219e2ba1f1d169a7f92dcf2cbd4e05f0 Gitweb: http://git.kernel.org/tip/9d36dfcf219e2ba1f1d169a7f92dcf2cbd4e05f0 Author: Cyrill Gorcunov <gorcunov(a)openvz.org> AuthorDate: Wed, 19 May 2010 01:19:18 +0400 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Wed, 19 May 2010 09:41:05 +0200 perf, x86: P4_pmu_schedule_events -- use smp_processor_id instead of raw_ This snippet somehow escaped the commit: | commit 137351e0feeb9f25d99488ee1afc1c79f5499a9a | Author: Cyrill Gorcunov <gorcunov(a)openvz.org> | Date: Sat May 8 15:25:52 2010 +0400 | | x86, perf: P4 PMU -- protect sensible procedures from preemption so bring it eventually back. It helps to catch preemption issue (if there will be, rule of thumb -- don't use raw_ if you can). Signed-off-by: Cyrill Gorcunov <gorcunov(a)openvz.org> Cc: Lin Ming <ming.m.lin(a)intel.com> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> LKML-Reference: <20100518212439.167259349(a)openvz.org> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c index 5f8e36d..ae85d69 100644 --- a/arch/x86/kernel/cpu/perf_event_p4.c +++ b/arch/x86/kernel/cpu/perf_event_p4.c @@ -763,7 +763,7 @@ static int p4_pmu_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign { unsigned long used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)]; unsigned long escr_mask[BITS_TO_LONGS(P4_ESCR_MSR_TABLE_SIZE)]; - int cpu = raw_smp_processor_id(); + int cpu = smp_processor_id(); struct hw_perf_event *hwc; struct p4_event_bind *bind; unsigned int i, thread, num; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |