iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: apic - unify disableapic and nolapic setup handlers

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2008-08-18 20:46:01 +04:00 committed by Ingo Molnar
parent 79af9bec60
commit 789fa73571
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/apic_32.c
View File

@ -1737,13 +1737,20 @@ static int __init parse_lapic(char *arg)
} }
early_param("lapic", parse_lapic); early_param("lapic", parse_lapic);
static int __init parse_nolapic(char *arg) static int __init setup_disableapic(char *arg)
{ {
disable_apic = 1; disable_apic = 1;
setup_clear_cpu_cap(X86_FEATURE_APIC); setup_clear_cpu_cap(X86_FEATURE_APIC);
return 0; 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) static int __init parse_disable_apic_timer(char *arg)
{ {

6
arch/x86/kernel/apic_64.c
View File

@ -1759,7 +1759,7 @@ early_param("nox2apic", setup_nox2apic);
/* /*
* APIC command line parameters * APIC command line parameters
*/ */
static __init int setup_disableapic(char *str) static int __init setup_disableapic(char *arg)
{ {
disable_apic = 1; disable_apic = 1;
setup_clear_cpu_cap(X86_FEATURE_APIC); setup_clear_cpu_cap(X86_FEATURE_APIC);
@ -1768,9 +1768,9 @@ static __init int setup_disableapic(char *str)
early_param("disableapic", setup_disableapic); early_param("disableapic", setup_disableapic);
/* same as disableapic, for compatibility */ /* 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); early_param("nolapic", setup_nolapic);