The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 13148e22c151e871c1c00bab519f39cc6f6ea37a Gitweb: https://git.kernel.org/tip/13148e22c151e871c1c00bab519f39cc6f6ea37a Author: Borislav Petkov (AMD) <bp@xxxxxxxxx> AuthorDate: Mon, 02 Dec 2024 20:00:11 +01:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Tue, 10 Dec 2024 18:55:08 +01:00 x86/apic: Remove "disablelapic" cmdline option The convention is "no<something>" and there already is "nolapic". Drop the disable one. Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Reviewed-by: Sohil Mehta <sohil.mehta@xxxxxxxxx> Link: https://lore.kernel.org/r/20241202190011.11979-2-bp@xxxxxxxxxx --- arch/x86/kernel/apic/apic.c | 9 +-------- arch/x86/kernel/cpu/topology.c | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index c5fb28e..1267b26 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2582,19 +2582,12 @@ int apic_is_clustered_box(void) /* * APIC command line parameters */ -static int __init setup_disableapic(char *arg) +static int __init setup_nolapic(char *arg) { apic_is_disabled = true; setup_clear_cpu_cap(X86_FEATURE_APIC); return 0; } -early_param("disableapic", setup_disableapic); - -/* same as disableapic, for compatibility */ -static int __init setup_nolapic(char *arg) -{ - return setup_disableapic(arg); -} early_param("nolapic", setup_nolapic); static int __init parse_lapic_timer_c2_ok(char *arg) diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c index 621a151..6ebed85 100644 --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -428,7 +428,7 @@ void __init topology_apply_cmdline_limits_early(void) { unsigned int possible = nr_cpu_ids; - /* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' 'noapic' */ + /* 'maxcpus=0' 'nosmp' 'nolapic' 'noapic' */ if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled) possible = 1;