x86: drop pointless CONFIG_X86_HT Signed-off-by: Jan Beulich --- This requires the patch series at http://lists.xenproject.org/archives/html/xen-devel/2014-06/msg03336.html as a prerequisite. --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -385,7 +385,6 @@ static void check_syscfg_dram_mod_en(voi static void __devinit amd_get_topology(struct cpuinfo_x86 *c) { -#ifdef CONFIG_X86_HT int cpu; unsigned bits; @@ -423,7 +422,6 @@ static void __devinit amd_get_topology(s "Core", cpu_has(c, X86_FEATURE_TOPOEXT) ? c->compute_unit_id : c->cpu_core_id); -#endif } static void __devinit init_amd(struct cpuinfo_x86 *c) --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -233,6 +233,7 @@ static void __cpuinit generic_identify(s c->x86_model += ((tfms >> 16) & 0xF) << 4; c->x86_mask = tfms & 15; c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); + c->phys_proc_id = c->apicid; if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -257,10 +258,6 @@ static void __cpuinit generic_identify(s } early_intel_workaround(c); - -#ifdef CONFIG_X86_HT - c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; -#endif } /* @@ -429,7 +426,6 @@ void __cpuinit detect_extended_topology( } } -#ifdef CONFIG_X86_HT void __cpuinit detect_ht(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx; @@ -474,7 +470,6 @@ void __cpuinit detect_ht(struct cpuinfo_ c->cpu_core_id); } } -#endif unsigned int __init apicid_to_socket(unsigned int apicid) { --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -17,7 +17,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG #define CONFIG_X86 1 -#define CONFIG_X86_HT 1 #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_X86_LOCAL_APIC 1 #define CONFIG_X86_GOOD_APIC 1 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -211,11 +211,7 @@ extern void dodgy_tsc(void); extern void detect_extended_topology(struct cpuinfo_x86 *c); -#ifdef CONFIG_X86_HT extern void detect_ht(struct cpuinfo_x86 *c); -#else -static always_inline void detect_ht(struct cpuinfo_x86 *c) {} -#endif #define cpu_to_core(_cpu) (cpu_data[_cpu].cpu_core_id) #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id)