diff options
| author |   Cyrill Gorcunov <gorcunov@openvz.org> | 2010-05-19 01:19:18 +0400 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2010-05-19 09:41:05 +0200 |
| commit | 9d36dfcf219e2ba1f1d169a7f92dcf2cbd4e05f0 (patch) | |
| tree | a8f4f8478e95f1a8359d99192662a038d5720500 /arch/x86/kernel | |
| parent | perf, x86: P4 PMU -- do a real check for ESCR address being in hash (diff) | |
| download | linux-dev-9d36dfcf219e2ba1f1d169a7f92dcf2cbd4e05f0.tar.xz linux-dev-9d36dfcf219e2ba1f1d169a7f92dcf2cbd4e05f0.zip | |
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@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@openvz.org>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20100518212439.167259349@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | 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 5f8e36d62793..ae85d69644d1 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; |