From e46360fc835187eb387243086fb51aa297e863a7 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 2 May 2007 19:27:16 +0200 Subject: [PATCH] --- yaml --- r: 53874 b: refs/heads/master c: 978c038ec944e4f2c940b0975c6acb433203a9be h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-i386/percpu.h | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6949471b0083..954876eb677e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c3576d261ce046789a7db14f43303f8120910c7 +refs/heads/master: 978c038ec944e4f2c940b0975c6acb433203a9be diff --git a/trunk/include/asm-i386/percpu.h b/trunk/include/asm-i386/percpu.h index c5f12f0d9c23..cdcb63db30a9 100644 --- a/trunk/include/asm-i386/percpu.h +++ b/trunk/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 */