linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-s390 / percpu.h

diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h
index 28b3517..123fcac 100644 (file)
--- a/include/asm-s390/percpu.h
+++ b/include/asm-s390/percpu.h
@@ -40,17 +40,16 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
     __typeof__(type) per_cpu__##name
 
 #define __get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
-#define __raw_get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
 #define per_cpu(var,cpu) __reloc_hide(var,__per_cpu_offset[cpu])
-#define per_cpu_offset(x) (__per_cpu_offset[x])
 
 /* A macro to avoid #include hell... */
 #define percpu_modcopy(pcpudst, src, size)                     \
 do {                                                           \
        unsigned int __i;                                       \
-       for_each_possible_cpu(__i)                              \
-               memcpy((pcpudst)+__per_cpu_offset[__i],         \
-                      (src), (size));                          \
+       for (__i = 0; __i < NR_CPUS; __i++)                     \
+               if (cpu_possible(__i))                          \
+                       memcpy((pcpudst)+__per_cpu_offset[__i], \
+                              (src), (size));                  \
 } while (0)
 
 #else /* ! SMP */
@@ -59,7 +58,6 @@ do {                                                          \
     __typeof__(type) per_cpu__##name
 
 #define __get_cpu_var(var) __reloc_hide(var,0)
-#define __raw_get_cpu_var(var) __reloc_hide(var,0)
 #define per_cpu(var,cpu) __reloc_hide(var,0)
 
 #endif /* SMP */