Re: [PATCH] x86/cpu: Move identify_cpu_without_cpuid() into main branch

From: Thomas Gleixner
Date: Mon Jun 10 2024 - 10:08:21 EST


On Tue, May 21 2024 at 15:48, Nikolay Borisov wrote:
> No point in duplicating if (!have_cpuid_p()) check. Simply move
> identify_cpu_without_cpuid() into the else branch. No functional
> changes.

You wish :)

> Signed-off-by: Nikolay Borisov <nik.borisov@xxxxxxxx>
> ---
> arch/x86/kernel/cpu/common.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index 2b170da84f97..69265c0acaea 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -1578,9 +1578,6 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
> memset(&c->x86_capability, 0, sizeof(c->x86_capability));
> c->extended_cpuid_level = 0;
>
> - if (!have_cpuid_p())
> - identify_cpu_without_cpuid(c);
> -

You might look what identify_cpu_without_cpuid() does and how the
comment right here might be related:

> /* cyrix could have cpuid enabled via c_identify()*/
> if (have_cpuid_p()) {

Thanks,

tglx