forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
c7ea4b31fd
commit
11c80c8367
|
@ -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 */
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user