Commit 13148e22 authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)
Browse files

x86/apic: Remove "disablelapic" cmdline option 



The convention is "no<something>" and there already is "nolapic". Drop
the disable one.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20241202190011.11979-2-bp@kernel.org
parent ab0e7f20

arch/x86/kernel/apic/apic.c

+1 −8
Original line number Diff line number Diff line
@@ -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)

arch/x86/kernel/cpu/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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;