diff --git a/[refs] b/[refs]
index be3ba1d14161..3341de529715 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a338af2c648f5e07c582154745a6c60cd2d8bf12
+refs/heads/master: cd3adf52309867955d6e2175246b526442235805
diff --git a/trunk/arch/x86/kernel/smpcommon.c b/trunk/arch/x86/kernel/smpcommon.c
index 84395fabc410..7e157810062f 100644
--- a/trunk/arch/x86/kernel/smpcommon.c
+++ b/trunk/arch/x86/kernel/smpcommon.c
@@ -3,8 +3,13 @@
  */
 #include <linux/module.h>
 #include <asm/smp.h>
+#include <asm/sections.h>
 
+#ifdef CONFIG_X86_64
+DEFINE_PER_CPU(unsigned long, this_cpu_off) = (unsigned long)__per_cpu_load;
+#else
 DEFINE_PER_CPU(unsigned long, this_cpu_off);
+#endif
 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
 
 #ifdef CONFIG_X86_32