public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/apic: Remove "disablelapic" cmdline option

Browse source 
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
This commit is contained in:
Borislav Petkov (AMD) 2024-12-02 20:00:11 +01:00
parent ab0e7f2076
commit 13148e22c1
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/kernel/apic/apic.c
View file

@ -2582,19 +2582,12 @@ int apic_is_clustered_box(void)
/* /*
* APIC command line parameters * APIC command line parameters
*/ */
static int __init setup_disableapic(char *arg) static int __init setup_nolapic(char *arg)
{ {
apic_is_disabled = true; apic_is_disabled = true;
setup_clear_cpu_cap(X86_FEATURE_APIC); setup_clear_cpu_cap(X86_FEATURE_APIC);
return 0; 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); early_param("nolapic", setup_nolapic);
static int __init parse_lapic_timer_c2_ok(char *arg) static int __init parse_lapic_timer_c2_ok(char *arg)

2
arch/x86/kernel/cpu/topology.c
View file

@ -428,7 +428,7 @@ void __init topology_apply_cmdline_limits_early(void)
{ {
unsigned int possible = nr_cpu_ids; 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) if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled)
possible = 1; possible = 1;