aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2011-05-17 15:25:21 -0400
committerChris Metcalf <cmetcalf@tilera.com>2011-05-19 22:56:05 -0400
commitf4de51de2edcd26ec77bfc71b1f00b1de5a5dc20 (patch)
tree5d565f18fbb0b0edc82af64d7d98e342a0c1c6d8 /arch
parent571d76acdab95876aeff869ab6449f826c23aa43 (diff)
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: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/tile/kernel/pci.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 65add0270bb6..6d4cb5d7a9fd 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -188,12 +188,6 @@ int __devinit tile_pci_init(void)
188 188
189 controller = &controllers[i]; 189 controller = &controllers[i];
190 190
191 if (tile_init_irqs(i, controller)) {
192 pr_err("PCI: Could not initialize "
193 "IRQs, aborting.\n");
194 goto err_cont;
195 }
196
197 controller->index = i; 191 controller->index = i;
198 controller->hv_cfg_fd[0] = hv_cfg_fd0; 192 controller->hv_cfg_fd[0] = hv_cfg_fd0;
199 controller->hv_cfg_fd[1] = hv_cfg_fd1; 193 controller->hv_cfg_fd[1] = hv_cfg_fd1;
@@ -316,6 +310,11 @@ int __devinit pcibios_init(void)
316 struct pci_controller *controller = &controllers[i]; 310 struct pci_controller *controller = &controllers[i];
317 struct pci_bus *bus; 311 struct pci_bus *bus;
318 312
313 if (tile_init_irqs(i, controller)) {
314 pr_err("PCI: Could not initialize IRQs\n");
315 continue;
316 }
317
319 pr_info("PCI: initializing controller #%d\n", i); 318 pr_info("PCI: initializing controller #%d\n", i);
320 319
321 /* 320 /*