Skip to content

Commit 13148e2

Browse files
committed
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) <[email protected]> Reviewed-by: Sohil Mehta <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ab0e7f2 commit 13148e2

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

arch/x86/kernel/apic/apic.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2582,19 +2582,12 @@ int apic_is_clustered_box(void)
25822582
/*
25832583
* APIC command line parameters
25842584
*/
2585-
static int __init setup_disableapic(char *arg)
2585+
static int __init setup_nolapic(char *arg)
25862586
{
25872587
apic_is_disabled = true;
25882588
setup_clear_cpu_cap(X86_FEATURE_APIC);
25892589
return 0;
25902590
}
2591-
early_param("disableapic", setup_disableapic);
2592-
2593-
/* same as disableapic, for compatibility */
2594-
static int __init setup_nolapic(char *arg)
2595-
{
2596-
return setup_disableapic(arg);
2597-
}
25982591
early_param("nolapic", setup_nolapic);
25992592

26002593
static int __init parse_lapic_timer_c2_ok(char *arg)

arch/x86/kernel/cpu/topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ void __init topology_apply_cmdline_limits_early(void)
428428
{
429429
unsigned int possible = nr_cpu_ids;
430430

431-
/* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' 'noapic' */
431+
/* 'maxcpus=0' 'nosmp' 'nolapic' 'noapic' */
432432
if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled)
433433
possible = 1;
434434

0 commit comments

Comments
 (0)