diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 13:31:22 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:20:26 +0100 |
commit | d4c9a9f3d416cfa1f5ffbe09d864d069467fe693 (patch) | |
tree | 647f78d7d845734fdab95c8a05a20b0a80015709 /arch/x86/kernel/cpu/addon_cpuid_features.c | |
parent | b0b20e5a3a6615ae750804523aeedd32911bb9d6 (diff) | |
download | kernel_samsung_smdk4412-d4c9a9f3d416cfa1f5ffbe09d864d069467fe693.zip kernel_samsung_smdk4412-d4c9a9f3d416cfa1f5ffbe09d864d069467fe693.tar.gz kernel_samsung_smdk4412-d4c9a9f3d416cfa1f5ffbe09d864d069467fe693.tar.bz2 |
x86, apic: unify phys_pkg_id()
- unify the call signature of 64-bit to that of 32-bit
- clean up the types all around
- clean up namespace contamination
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 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index 4e581fd..84f8e4a 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c @@ -116,7 +116,6 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; -#ifdef CONFIG_X86_32 c->cpu_core_id = 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); @@ -124,14 +123,7 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) * Reinit the apicid, now that we have extended initial_apicid. */ c->apicid = phys_pkg_id(c->initial_apicid, 0); -#else - c->cpu_core_id = phys_pkg_id(ht_mask_width) & core_select_mask; - c->phys_proc_id = phys_pkg_id(core_plus_mask_width); - /* - * Reinit the apicid, now that we have extended initial_apicid. - */ - c->apicid = phys_pkg_id(0); -#endif + c->x86_max_cores = (core_level_siblings / smp_num_siblings); |