1 files changed, 7 insertions, 5 deletions

diff --git a/include/asm-i386/percpu.h b/include/asm-i386/percpu.h
index c5f12f0d9c23..cdcb63db30a9 100644
--- a/include/asm-i386/percpu.h
+++ b/include/asm-i386/percpu.h
@@ -16,12 +16,14 @@
  *    PER_CPU(cpu_gdt_descr, %ebx)
  */
 #ifdef CONFIG_SMP
-#define PER_CPU(var, reg)                       \
-        movl %fs:per_cpu__this_cpu_off, reg;            \
-        addl $per_cpu__##var, reg
+#define PER_CPU(var, reg)                               \
+        movl %fs:per_cpu__##this_cpu_off, reg;          \
+        lea per_cpu__##var(reg), reg
+#define PER_CPU_VAR(var)        %fs:per_cpu__##var
 #else /* ! SMP */
-#define PER_CPU(var, reg) \
-        movl $per_cpu__##var, reg;
+#define PER_CPU(var, reg)                       \
+        movl $per_cpu__##var, reg
+#define PER_CPU_VAR(var)        per_cpu__##var
 #endif  /* SMP */
 
 #else /* ...!ASSEMBLY */