Browse Source

[PATCH] adjust per_cpu definition in non-SMP case

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 <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jan Beulich 20 years ago
parent
commit
11c80c8367
3 changed files with 3 additions and 3 deletions
  1. 1 1
      include/asm-generic/percpu.h
  2. 1 1
      include/asm-ia64/percpu.h
  3. 1 1
      include/asm-x86_64/percpu.h

+ 1 - 1
include/asm-generic/percpu.h

@@ -29,7 +29,7 @@ do {								\
 #define DEFINE_PER_CPU(type, name) \
 #define DEFINE_PER_CPU(type, name) \
     __typeof__(type) per_cpu__##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
 #define __get_cpu_var(var)			per_cpu__##var
 
 
 #endif	/* SMP */
 #endif	/* SMP */

+ 1 - 1
include/asm-ia64/percpu.h

@@ -50,7 +50,7 @@ extern void *per_cpu_init(void);
 
 
 #else /* ! SMP */
 #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 __get_cpu_var(var)			per_cpu__##var
 #define per_cpu_init()				(__phys_per_cpu_start)
 #define per_cpu_init()				(__phys_per_cpu_start)
 
 

+ 1 - 1
include/asm-x86_64/percpu.h

@@ -39,7 +39,7 @@ extern void setup_per_cpu_areas(void);
 #define DEFINE_PER_CPU(type, name) \
 #define DEFINE_PER_CPU(type, name) \
     __typeof__(type) per_cpu__##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
 #define __get_cpu_var(var)			per_cpu__##var
 
 
 #endif	/* SMP */
 #endif	/* SMP */