aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-18 12:46:01 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-18 20:07:19 -0400
commit789fa735712d726b5cfa5c6be57171b5637a4872 (patch)
treef32280337a8c22efaca027c489e809c451d98e97 /arch/x86/kernel/apic_64.c
parent79af9bec60e6e218a1e48e8830d603d64a7fc441 (diff)
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_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 999781810c09..7a317180ba2e 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1759,7 +1759,7 @@ early_param("nox2apic", setup_nox2apic);
1759/* 1759/*
1760 * APIC command line parameters 1760 * APIC command line parameters
1761 */ 1761 */
1762static __init int setup_disableapic(char *str) 1762static int __init setup_disableapic(char *arg)
1763{ 1763{
1764 disable_apic = 1; 1764 disable_apic = 1;
1765 setup_clear_cpu_cap(X86_FEATURE_APIC); 1765 setup_clear_cpu_cap(X86_FEATURE_APIC);
@@ -1768,9 +1768,9 @@ static __init int setup_disableapic(char *str)
1768early_param("disableapic", setup_disableapic); 1768early_param("disableapic", setup_disableapic);
1769 1769
1770/* same as disableapic, for compatibility */ 1770/* same as disableapic, for compatibility */
1771static __init int setup_nolapic(char *str) 1771static int __init setup_nolapic(char *arg)
1772{ 1772{
1773 return setup_disableapic(str); 1773 return setup_disableapic(arg);
1774} 1774}
1775early_param("nolapic", setup_nolapic); 1775early_param("nolapic", setup_nolapic);
1776 1776