diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 13:24:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:20:27 +0100 |
commit | cb8cc442dc7e07cb5438b357843ab4095ad73933 (patch) | |
tree | d818d1814507b2fe71f1e07c4bc108fe0c9ebb91 /arch/x86/kernel/cpu/addon_cpuid_features.c | |
parent | d4c9a9f3d416cfa1f5ffbe09d864d069467fe693 (diff) | |
download | kernel_samsung_smdk4412-cb8cc442dc7e07cb5438b357843ab4095ad73933.zip kernel_samsung_smdk4412-cb8cc442dc7e07cb5438b357843ab4095ad73933.tar.gz kernel_samsung_smdk4412-cb8cc442dc7e07cb5438b357843ab4095ad73933.tar.bz2 |
x86, apic: refactor ->phys_pkg_id()
Refactor the ->phys_pkg_id() methods:
- namespace separation
- macro wrapper removal
- open-coded calls to the methods in the generic code
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/addon_cpuid_features.c')
-rw-r--r-- | arch/x86/kernel/cpu/addon_cpuid_features.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index 84f8e4a..e8bb892 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c @@ -116,13 +116,13 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; - c->cpu_core_id = phys_pkg_id(c->initial_apicid, ht_mask_width) + c->cpu_core_id = apic->phys_pkg_id(c->initial_apicid, ht_mask_width) & core_select_mask; - c->phys_proc_id = phys_pkg_id(c->initial_apicid, core_plus_mask_width); + c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, core_plus_mask_width); /* * Reinit the apicid, now that we have extended initial_apicid. */ - c->apicid = phys_pkg_id(c->initial_apicid, 0); + c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); c->x86_max_cores = (core_level_siblings / smp_num_siblings); |