Commit f4de51de authored by Chris Metcalf's avatar Chris Metcalf

arch/tile: allocate PCI IRQs later in boot

This change became required due to some recent reworking in the
platform-independent IRQ code.  It is required for 2.6.38 and later.

Cc: stable@kernel.org
Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent 571d76ac
...@@ -188,12 +188,6 @@ int __devinit tile_pci_init(void) ...@@ -188,12 +188,6 @@ int __devinit tile_pci_init(void)
controller = &controllers[i]; controller = &controllers[i];
if (tile_init_irqs(i, controller)) {
pr_err("PCI: Could not initialize "
"IRQs, aborting.\n");
goto err_cont;
}
controller->index = i; controller->index = i;
controller->hv_cfg_fd[0] = hv_cfg_fd0; controller->hv_cfg_fd[0] = hv_cfg_fd0;
controller->hv_cfg_fd[1] = hv_cfg_fd1; controller->hv_cfg_fd[1] = hv_cfg_fd1;
...@@ -316,6 +310,11 @@ int __devinit pcibios_init(void) ...@@ -316,6 +310,11 @@ int __devinit pcibios_init(void)
struct pci_controller *controller = &controllers[i]; struct pci_controller *controller = &controllers[i];
struct pci_bus *bus; struct pci_bus *bus;
if (tile_init_irqs(i, controller)) {
pr_err("PCI: Could not initialize IRQs\n");
continue;
}
pr_info("PCI: initializing controller #%d\n", i); pr_info("PCI: initializing controller #%d\n", i);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment