Skip to content

Commit

Permalink
arch/tile: allocate PCI IRQs later in boot
Browse files Browse the repository at this point in the history
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: [email protected]
Signed-off-by: Chris Metcalf <[email protected]>
  • Loading branch information
cmetcalf-tilera committed May 20, 2011
1 parent 571d76a commit f4de51d
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions arch/tile/kernel/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,6 @@ int __devinit tile_pci_init(void)

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->hv_cfg_fd[0] = hv_cfg_fd0;
controller->hv_cfg_fd[1] = hv_cfg_fd1;
Expand Down Expand Up @@ -316,6 +310,11 @@ int __devinit pcibios_init(void)
struct pci_controller *controller = &controllers[i];
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);

/*
Expand Down

0 comments on commit f4de51d

Please sign in to comment.