Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 789fa735 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify disableapic and nolapic setup handlers 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 79af9bec

arch/x86/kernel/apic_32.c

+9 −2
Original line number Diff line number Diff line
@@ -1737,13 +1737,20 @@ static int __init parse_lapic(char *arg) 
}

early_param("lapic", parse_lapic);



static int __init parse_nolapic(char *arg)

static int __init setup_disableapic(char *arg)

{

	disable_apic = 1;

	setup_clear_cpu_cap(X86_FEATURE_APIC);

	return 0;

}

early_param("nolapic", parse_nolapic);

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_disable_apic_timer(char *arg)

{

arch/x86/kernel/apic_64.c

+3 −3
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ early_param("nox2apic", setup_nox2apic); 
/*

 * APIC command line parameters

 */

static __init int setup_disableapic(char *str)

static int __init setup_disableapic(char *arg)

{

	disable_apic = 1;

	setup_clear_cpu_cap(X86_FEATURE_APIC);
@@ -1768,9 +1768,9 @@ static __init int setup_disableapic(char *str) 
early_param("disableapic", setup_disableapic);



/* same as disableapic, for compatibility */

static __init int setup_nolapic(char *str)

static int __init setup_nolapic(char *arg)

{

	return setup_disableapic(str);

	return setup_disableapic(arg);

}

early_param("nolapic", setup_nolapic);