From: "Jan Beulich" Fix (in the architectures I'm actually building for) the UP definition of per_cpu so that the cpu specified may be any expression, not just an identifier or a suffix expression. Signed-off-by: Jan Beulich Signed-off-by: Andrew Morton --- include/asm-generic/percpu.h | 2 +- include/asm-ia64/percpu.h | 2 +- include/asm-x86_64/percpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN include/asm-generic/percpu.h~adjust-per_cpu-definition-in-non-smp-case include/asm-generic/percpu.h --- 25/include/asm-generic/percpu.h~adjust-per_cpu-definition-in-non-smp-case 2005-05-13 22:23:49.000000000 -0700 +++ 25-akpm/include/asm-generic/percpu.h 2005-05-13 22:23:50.000000000 -0700 @@ -29,7 +29,7 @@ do { \ #define DEFINE_PER_CPU(type, name) \ __typeof__(type) per_cpu__##name -#define per_cpu(var, cpu) (*((void)cpu, &per_cpu__##var)) +#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) #define __get_cpu_var(var) per_cpu__##var #endif /* SMP */ diff -puN include/asm-ia64/percpu.h~adjust-per_cpu-definition-in-non-smp-case include/asm-ia64/percpu.h --- 25/include/asm-ia64/percpu.h~adjust-per_cpu-definition-in-non-smp-case 2005-05-13 22:23:49.000000000 -0700 +++ 25-akpm/include/asm-ia64/percpu.h 2005-05-13 22:23:50.000000000 -0700 @@ -50,7 +50,7 @@ extern void *per_cpu_init(void); #else /* ! SMP */ -#define per_cpu(var, cpu) (*((void)cpu, &per_cpu__##var)) +#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) #define __get_cpu_var(var) per_cpu__##var #define per_cpu_init() (__phys_per_cpu_start) diff -puN include/asm-x86_64/percpu.h~adjust-per_cpu-definition-in-non-smp-case include/asm-x86_64/percpu.h --- 25/include/asm-x86_64/percpu.h~adjust-per_cpu-definition-in-non-smp-case 2005-05-13 22:23:49.000000000 -0700 +++ 25-akpm/include/asm-x86_64/percpu.h 2005-05-13 22:23:50.000000000 -0700 @@ -39,7 +39,7 @@ extern void setup_per_cpu_areas(void); #define DEFINE_PER_CPU(type, name) \ __typeof__(type) per_cpu__##name -#define per_cpu(var, cpu) (*((void)cpu, &per_cpu__##var)) +#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) #define __get_cpu_var(var) per_cpu__##var #endif /* SMP */ _