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@alien8.de>
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20241202190011.11979-2-bp@kernel.org

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index c5fb28e6451a3415a7af8576285b0a3ae633e6b9..1267b2691abc3be51959896eb3cebf553bcd9e85 100644 (file)
--- 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 621a151ccf7d0a89699a9db2bd619b4fa92bfd47..6ebed852a9ef7fcca80553414cfcfcf063045937 100644 (file)
--- 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;