Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-i386 / percpu.h

diff --git a/include/asm-i386/percpu.h b/include/asm-i386/percpu.h
index c5f12f0d9c23b43f421e6cdf0382a3021907e936..a7ebd436f3cc513f61f6d154ee59566cd0de9fd3 100644 (file)
--- 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 */
@@ -45,11 +47,18 @@
 /* This is used for other cpus to find our section. */
 extern unsigned long __per_cpu_offset[];
 
+#define per_cpu_offset(x) (__per_cpu_offset[x])
+
 /* Separate out the type, so (int[3], foo) works. */
 #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name
 #define DEFINE_PER_CPU(type, name) \
     __attribute__((__section__(".data.percpu"))) __typeof__(type) per_cpu__##name
 
+#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)              \
+    __attribute__((__section__(".data.percpu.shared_aligned"))) \
+    __typeof__(type) per_cpu__##name                           \
+    ____cacheline_aligned_in_smp
+
 /* We can use this directly for local CPU (faster). */
 DECLARE_PER_CPU(unsigned long, this_cpu_off);