From e68c8d7f2bc3b4412a6f6acdb3fa15887a9dbb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Date: Thu, 7 Aug 2014 17:00:50 +0000 Subject: [PATCH] atpic: make sure atpic_init is called after IO APIC initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested by: David Wolfskill , Trond Endrestøl Sponsored by: Citrix Systems R&D --- sys/x86/isa/atpic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index 6ce6d1a2cb1..e3fdb34d7f2 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)