1 files changed, 6 insertions, 11 deletions

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 55c8cc3647a7..54d5f3131060 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -429,8 +429,11 @@ static __init void xen_setup_acpi_sci(void)
         return;
 }
 #endif
-static int __init pci_xen_initial_domain(void)
+
+int __init pci_xen_initial_domain(void)
 {
+        int pirq, irq;
+
 #ifdef CONFIG_PCI_MSI
         x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
         x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
@@ -439,15 +442,6 @@ static int __init pci_xen_initial_domain(void)
         xen_setup_acpi_sci();
         __acpi_register_gsi = acpi_register_gsi_xen;
 #endif
-        return 0;
-}
-
-void __init xen_setup_pirqs(void)
-{
-        int pirq, irq;
-
-        pci_xen_initial_domain();
-
         if (0 == nr_ioapics) {
                 for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
                         pirq = xen_allocate_pirq_gsi(irq);
@@ -456,7 +450,7 @@ void __init xen_setup_pirqs(void)
                                 break;
                         irq = xen_bind_pirq_gsi_to_irq(irq, pirq, 0, "xt-pic");
                 }
-                return;
+                return 0;
         }
 #ifdef CONFIG_ACPI
         /* Pre-allocate legacy irqs */
@@ -471,6 +465,7 @@ void __init xen_setup_pirqs(void)
                         true /* allocate IRQ */);
         }
 #endif
+        return 0;
 }
 
 struct xen_device_domain_owner {