File tree Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -2582,19 +2582,12 @@ int apic_is_clustered_box(void)
2582
2582
/*
2583
2583
* APIC command line parameters
2584
2584
*/
2585
- static int __init setup_disableapic (char * arg )
2585
+ static int __init setup_nolapic (char * arg )
2586
2586
{
2587
2587
apic_is_disabled = true;
2588
2588
setup_clear_cpu_cap (X86_FEATURE_APIC );
2589
2589
return 0 ;
2590
2590
}
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
- }
2598
2591
early_param ("nolapic" , setup_nolapic );
2599
2592
2600
2593
static int __init parse_lapic_timer_c2_ok (char * arg )
Original file line number Diff line number Diff line change @@ -428,7 +428,7 @@ void __init topology_apply_cmdline_limits_early(void)
428
428
{
429
429
unsigned int possible = nr_cpu_ids ;
430
430
431
- /* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' ' noapic' */
431
+ /* 'maxcpus=0' 'nosmp' 'nolapic' 'noapic' */
432
432
if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled )
433
433
possible = 1 ;
434
434
You can’t perform that action at this time.
0 commit comments