Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -6
+5 -6
arch/tile/kernel/pci.c
··· 188 188 189 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 191 controller->index = i; 198 192 controller->hv_cfg_fd[0] = hv_cfg_fd0; 199 193 controller->hv_cfg_fd[1] = hv_cfg_fd1; ··· 309 315 if (pci_scan_flags[i] == 0 && controllers[i].ops != NULL) { 310 316 struct pci_controller *controller = &controllers[i]; 311 317 struct pci_bus *bus; 318 + 319 + if (tile_init_irqs(i, controller)) { 320 + pr_err("PCI: Could not initialize IRQs\n"); 321 + continue; 322 + } 312 323 313 324 pr_info("PCI: initializing controller #%d\n", i); 314 325