lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: make early_per_cpu() a lvalue and use it

Browse Source 
Make early_per_cpu() a lvalue as per_cpu() is and use it where
applicable.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Tejun Heo
2009-01-13 20:41:34 +09:00
committed by Ingo Molnar
parent 7de6883faa
commit f10fcd4712
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/percpu.h
View File

@@ -195,9 +195,9 @@ do { \
#define early_per_cpu_ptr(_name) (_name##_early_ptr) #define early_per_cpu_ptr(_name) (_name##_early_ptr)
#define early_per_cpu_map(_name, _idx) (_name##_early_map[_idx]) #define early_per_cpu_map(_name, _idx) (_name##_early_map[_idx])
#define early_per_cpu(_name, _cpu) \ #define early_per_cpu(_name, _cpu) \
(early_per_cpu_ptr(_name) ? \ *(early_per_cpu_ptr(_name) ? \
early_per_cpu_ptr(_name)[_cpu] : \ &early_per_cpu_ptr(_name)[_cpu] : \
per_cpu(_name, _cpu)) &per_cpu(_name, _cpu))
#else /* !CONFIG_SMP */ #else /* !CONFIG_SMP */
#define DEFINE_EARLY_PER_CPU(_type, _name, _initvalue) \ #define DEFINE_EARLY_PER_CPU(_type, _name, _initvalue) \

5
arch/x86/include/asm/topology.h
View File

@@ -102,10 +102,7 @@ static inline int cpu_to_node(int cpu)
/* Same function but used if called before per_cpu areas are setup */ /* Same function but used if called before per_cpu areas are setup */
static inline int early_cpu_to_node(int cpu) static inline int early_cpu_to_node(int cpu)
{ {
if (early_per_cpu_ptr(x86_cpu_to_node_map)) return early_per_cpu(x86_cpu_to_node_map, cpu);
return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu];
return per_cpu(x86_cpu_to_node_map, cpu);
} }
/* Returns a pointer to the cpumask of CPUs on Node 'node'. */ /* Returns a pointer to the cpumask of CPUs on Node 'node'. */

13
arch/x86/kernel/apic.c
View File

@@ -1877,17 +1877,8 @@ void __cpuinit generic_processor_info(int apicid, int version)
#endif #endif
#if defined(CONFIG_X86_SMP) || defined(CONFIG_X86_64) #if defined(CONFIG_X86_SMP) || defined(CONFIG_X86_64)
/* are we being called early in kernel startup? */ early_per_cpu(x86_cpu_to_apicid, cpu) = apicid;
if (early_per_cpu_ptr(x86_cpu_to_apicid)) { early_per_cpu(x86_bios_cpu_apicid, cpu) = apicid;
u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid);
u16 *bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
cpu_to_apicid[cpu] = apicid;
bios_cpu_apicid[cpu] = apicid;
} else {
per_cpu(x86_cpu_to_apicid, cpu) = apicid;
per_cpu(x86_bios_cpu_apicid, cpu) = apicid;
}
#endif #endif
set_cpu_possible(cpu, true); set_cpu_possible(cpu, true);