diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 20:46:01 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-19 04:07:19 +0400 |
| commit | 789fa735712d726b5cfa5c6be57171b5637a4872 (patch) | |
| tree | f32280337a8c22efaca027c489e809c451d98e97 /arch/x86/kernel/apic_32.c | |
| parent | 79af9bec60e6e218a1e48e8830d603d64a7fc441 (diff) | |
| download | linux-789fa735712d726b5cfa5c6be57171b5637a4872.tar.xz | |
x86: apic - unify disableapic and nolapic setup handlers
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index acbc4dea2ee8..5680bda62f78 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -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) { |