Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c80c83 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[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: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c7ea4b31

include/asm-generic/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

include/asm-ia64/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/asm-x86_64/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */