The following commit has been merged into the x86/apic branch of tip: Commit-ID: fab75e790f00dca592d9a934d9f1237b81093b99 Gitweb: https://git.kernel.org/tip/fab75e790f00dca592d9a934d9f1237b81093b99 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 13 Feb 2024 22:04:21 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Thu, 15 Feb 2024 22:07:38 +01:00 x86/cpu: Remove x86_coreid_bits No more users. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Tested-by: Juergen Gross <jgross@xxxxxxxx> Tested-by: Sohil Mehta <sohil.mehta@xxxxxxxxx> Tested-by: Michael Kelley <mhklinux@xxxxxxxxxxx> Tested-by: Zhang Rui <rui.zhang@xxxxxxxxx> Tested-by: Wang Wendy <wendy.wang@xxxxxxxxx> Tested-by: K Prateek Nayak <kprateek.nayak@xxxxxxx> Link: https://lore.kernel.org/r/20240212153625.455839743@xxxxxxxxxxxxx --- arch/x86/include/asm/processor.h | 2 -- arch/x86/kernel/cpu/common.c | 1 - 2 files changed, 3 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 4fbeffd..de1648e 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -122,8 +122,6 @@ struct cpuinfo_x86 { #endif __u8 x86_virt_bits; __u8 x86_phys_bits; - /* CPUID returned core id bits: */ - __u8 x86_coreid_bits; /* Max extended CPUID function supported: */ __u32 extended_cpuid_level; /* Maximum supported CPUID level, -1=no CPUID: */ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d72787d..33064e6 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1753,7 +1753,6 @@ static void identify_cpu(struct cpuinfo_x86 *c) c->x86_vendor_id[0] = '\0'; /* Unset */ c->x86_model_id[0] = '\0'; /* Unset */ c->x86_max_cores = 1; - c->x86_coreid_bits = 0; #ifdef CONFIG_X86_64 c->x86_clflush_size = 64; c->x86_phys_bits = 36;