diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 21:36:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:27:54 -0500 |
commit | 65a4e574d2382d83f71b30ea92f86d2e40a6ef8d (patch) | |
tree | d265ad2f64a3ae35ee3a9ad43b8c55b0e87f6c99 /arch/x86/kernel/io_apic.c | |
parent | d8106d2e24d54497233ca9cd97fa9bec807de458 (diff) |
smp, generic: introduce arch_disable_smp_support() instead of disable_ioapic_setup()
Impact: cleanup
disable_ioapic_setup() in init/main.c is ugly as the function is
x86-specific. The #ifdef inline prototype there is ugly too.
Replace it with a generic arch_disable_smp_support() function - which
has a weak alias for non-x86 architectures and for non-ioapic x86 builds.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/io_apic.c')
-rw-r--r-- | arch/x86/kernel/io_apic.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 57d60c741e37..84bccac4619f 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -98,10 +98,19 @@ DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | |||
98 | 98 | ||
99 | int skip_ioapic_setup; | 99 | int skip_ioapic_setup; |
100 | 100 | ||
101 | void arch_disable_smp_support(void) | ||
102 | { | ||
103 | #ifdef CONFIG_PCI | ||
104 | noioapicquirk = 1; | ||
105 | noioapicreroute = -1; | ||
106 | #endif | ||
107 | skip_ioapic_setup = 1; | ||
108 | } | ||
109 | |||
101 | static int __init parse_noapic(char *str) | 110 | static int __init parse_noapic(char *str) |
102 | { | 111 | { |
103 | /* disable IO-APIC */ | 112 | /* disable IO-APIC */ |
104 | disable_ioapic_setup(); | 113 | arch_disable_smp_support(); |
105 | return 0; | 114 | return 0; |
106 | } | 115 | } |
107 | early_param("noapic", parse_noapic); | 116 | early_param("noapic", parse_noapic); |