percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t

[linux-2.6-block.git] / arch / x86 / include / asm / perf_event_p4.h

diff --git a/arch/x86/include/asm/perf_event_p4.h b/arch/x86/include/asm/perf_event_p4.h
index 85e13ccf15c4f29f38ab3c89806346857697f2a4..d725382c2ae0f4c8d7fbe6db7818e9878b652f41 100644 (file)
--- a/arch/x86/include/asm/perf_event_p4.h
+++ b/arch/x86/include/asm/perf_event_p4.h
@@ -189,7 +189,7 @@ static inline int p4_ht_thread(int cpu)
 {
 #ifdef CONFIG_SMP
        if (smp_num_siblings == 2)
-               return cpu != cpumask_first(__get_cpu_var(cpu_sibling_map));
+               return cpu != cpumask_first(this_cpu_cpumask_var_ptr(cpu_sibling_map));
 #endif
        return 0;
 }