From: Cyrill Gorcunov on
This snippet somehow escaped the commit

| commit 137351e0feeb9f25d99488ee1afc1c79f5499a9a
| Author: Cyrill Gorcunov <gorcunov(a)>
| 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)>
Cc: Lin Ming <ming.m.lin(a)>
Cc: Steven Rostedt <rostedt(a)>
Cc: Peter Zijlstra <peterz(a)>
Cc: Frederic Weisbecker <fweisbec(a)>
arch/x86/kernel/cpu/perf_event_p4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c
--- linux-2.6.git.orig/arch/x86/kernel/cpu/perf_event_p4.c
+++ linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c
@@ -762,7 +762,7 @@ static int p4_pmu_schedule_events(struct
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)
More majordomo info at
Please read the FAQ at