From 0fdb10780e07f343b78862b97de97ffbd1d88a3a Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 16 Jan 2009 12:11:43 +0900
Subject: [PATCH] --- yaml --- r: 136431 b: refs/heads/master c:
 cd3adf52309867955d6e2175246b526442235805 h: refs/heads/master i:   136429:
 66f4e0541a519615c5a89d3ae9a040b9a0331915   136427:
 5c7d02e3c1f25d0b4a3b11009e8aad914226b993   136423:
 d98401ab7fcf084fbbdfe835bdd22add2d70f188   136415:
 5a1e7d59f60cde11e3fb4bfc694d96b25eba22b9 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/smpcommon.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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