patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / i386 / oprofile / op_model_p4.c

diff --git a/arch/i386/oprofile/op_model_p4.c b/arch/i386/oprofile/op_model_p4.c
index 7e41dc9..8b932b1 100644 (file)
--- a/arch/i386/oprofile/op_model_p4.c
+++ b/arch/i386/oprofile/op_model_p4.c
@@ -382,11 +382,8 @@ static struct p4_event_binding p4_events[NUM_EVENTS] = {
 static unsigned int get_stagger(void)
 {
 #ifdef CONFIG_SMP
-       int cpu;
-       if (smp_num_siblings > 1) {
-               cpu = smp_processor_id();
-               return (cpu_sibling_map[cpu] > cpu) ? 0 : 1;
-       }
+       int cpu = smp_processor_id();
+       return (cpu != first_cpu(cpu_sibling_map[cpu]));
 #endif 
        return 0;
 }