diff --git a/[refs] b/[refs]
index 94731d2531bf..9df430b62cd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bd9d6b64e1474f1a03f8660e8721d746cffae57
+refs/heads/master: 94a1e869c7b96a9d30e260084866383a145fd8ae
diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index 55402d2ab938..f92315ed68e1 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/include/asm-x86/processor.h
@@ -134,7 +134,7 @@ extern __u32			cleared_cpu_caps[NCAPINTS];
 #ifdef CONFIG_SMP
 DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info);
 #define cpu_data(cpu)		per_cpu(cpu_info, cpu)
-#define current_cpu_data	cpu_data(smp_processor_id())
+#define current_cpu_data	__get_cpu_var(cpu_info)
 #else
 #define cpu_data(cpu)		boot_cpu_data
 #define current_cpu_data	boot_cpu_data