Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / arch / x86 / oprofile / op_model_p4.c

diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 4c4a51c90bc26f31cfc192adf2fb341ba7fcc754..819b131fd752888c39b39f2fb386263223d9dd83 100644 (file)
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
@@ -380,7 +380,7 @@ static unsigned int get_stagger(void)
 {
 #ifdef CONFIG_SMP
        int cpu = smp_processor_id();
-       return (cpu != first_cpu(per_cpu(cpu_sibling_map, cpu)));
+       return cpu != cpumask_first(__get_cpu_var(cpu_sibling_map));
 #endif
        return 0;
 }