summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/io_apic.c
diff options
context:
space:
mode:
authorIngo Molnar2009-01-31 03:36:17 +0100
committerIngo Molnar2009-02-05 22:27:54 +0100
commit65a4e574d2382d83f71b30ea92f86d2e40a6ef8d (patch)
treed265ad2f64a3ae35ee3a9ad43b8c55b0e87f6c99 /arch/x86/kernel/io_apic.c
parentx86, vm86: clean up invalid_vm86_irq() (diff)
downloadkernel-qcow2-linux-65a4e574d2382d83f71b30ea92f86d2e40a6ef8d.tar.gz
kernel-qcow2-linux-65a4e574d2382d83f71b30ea92f86d2e40a6ef8d.tar.xz
kernel-qcow2-linux-65a4e574d2382d83f71b30ea92f86d2e40a6ef8d.zip
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.c11
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);
int skip_ioapic_setup;
+void arch_disable_smp_support(void)
+{
+#ifdef CONFIG_PCI
+ noioapicquirk = 1;
+ noioapicreroute = -1;
+#endif
+ skip_ioapic_setup = 1;
+}
+
static int __init parse_noapic(char *str)
{
/* disable IO-APIC */
- disable_ioapic_setup();
+ arch_disable_smp_support();
return 0;
}
early_param("noapic", parse_noapic);