[PATCH RFC 08/13] xen: change order of Xen intr init and IO APIC registration

[Roger Pau Monne]

Change order of some of the services in the SI_SUB_INTR stage, so
that it follows the order:

- System intr initialization
- Xen intr initalization
- IO APIC source registration
---
 sys/x86/x86/local_apic.c |    2 +-
 sys/x86/xen/xen_intr.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index 85736c8..c206281 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -1383,7 +1383,7 @@ apic_setup_io(void *dummy __unused)
 	/* Enable the MSI "pic". */
 	msi_init();
 }
-SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL);
+SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_THIRD, apic_setup_io, NULL);
 
 #ifdef SMP
 /*
diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c
index 340e5ed..700fd22 100644
--- a/sys/x86/xen/xen_intr.c
+++ b/sys/x86/xen/xen_intr.c
@@ -613,7 +613,7 @@ xen_intr_init(void *dummy __unused)
 
 	return (0);
 }
-SYSINIT(xen_intr_init, SI_SUB_INTR, SI_ORDER_MIDDLE, xen_intr_init, NULL);
+SYSINIT(xen_intr_init, SI_SUB_INTR, SI_ORDER_SECOND, xen_intr_init, NULL);
 
 /*--------------------------- Common PIC Functions ---------------------------*/
 /**
-- 
1.7.7.5 (Apple Git-26)