Skip to content

Commit

Permalink
x86/apic: Remove "disablelapic" cmdline option
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Borislav Petkov (AMD) committed Dec 10, 2024
1 parent ab0e7f2 commit 13148e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions arch/x86/kernel/apic/apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 13148e2

Please sign in to comment.