summaryrefslogtreecommitdiffstats
path: root/sys/x86/isa
diff options
context:
space:
mode:
authorroyger <royger@FreeBSD.org>2014-08-07 17:00:50 +0000
committerroyger <royger@FreeBSD.org>2014-08-07 17:00:50 +0000
commitc934f5fd2852ea5ed2fcbb043e6cf7316daa7e7e (patch)
tree9240fabc185b4ae72ceaec61d298fb7165730003 /sys/x86/isa
parent8565976fe44a0bba6070a29069b9bc3774f748d1 (diff)
downloadFreeBSD-src-c934f5fd2852ea5ed2fcbb043e6cf7316daa7e7e.zip
FreeBSD-src-c934f5fd2852ea5ed2fcbb043e6cf7316daa7e7e.tar.gz
atpic: make sure atpic_init is called after IO APIC initialization
After r269510 the IO APIC and ATPIC initialization is done at the same order, which means atpic_init can be called before the IO APIC has been initalized. In that case the ATPIC will take over the interrupt sources, preventing the IO APIC from registering them. Reported by: David Wolfskill <david@catwhisker.org> Tested by: David Wolfskill <david@catwhisker.org>, Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no> Sponsored by: Citrix Systems R&D
Diffstat (limited to 'sys/x86/isa')
-rw-r--r--sys/x86/isa/atpic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index 6ce6d1a..e3fdb34 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -524,7 +524,7 @@ atpic_init(void *dummy __unused)
intr_register_source(&ai->at_intsrc);
}
}
-SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL);
+SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_FOURTH, atpic_init, NULL);
void
atpic_handle_intr(u_int vector, struct trapframe *frame)
OpenPOWER on IntegriCloud