From b8a13f487a0f3168e9caeaff20bb978772cee0e7 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 5 Nov 2021 13:35:21 +0100 Subject: [PATCH] x86/APIC: rename cmdline_apic The name hasn't been appropriate for a long time: It covers not only command line overrides, but also x2APIC pre-enabled state. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/genapic/probe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index 1ee6cd73cd..66bc5ce072 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -24,7 +24,7 @@ static const struct genapic *const __initconstrel apic_probe[] = { NULL, }; -static bool_t __initdata cmdline_apic; +static bool __initdata forced_apic; void __init generic_bigsmp_probe(void) { @@ -35,7 +35,7 @@ void __init generic_bigsmp_probe(void) * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support */ - if (!cmdline_apic && genapic.name == apic_default.name) + if (!forced_apic && genapic.name == apic_default.name) if (apic_bigsmp.probe()) { genapic = apic_bigsmp; printk(KERN_INFO "Overriding APIC driver with %s\n", @@ -65,7 +65,7 @@ void __init generic_apic_probe(void) check_x2apic_preenabled(); - cmdline_apic = genapic.name; + forced_apic = genapic.name; for (i = 0; !genapic.name && apic_probe[i]; i++) { if (!apic_probe[i]->probe || apic_probe[i]->probe()) -- 2.39.5