[<prev] [next>] [day] [month] [year] [list]
Message-Id: <201105181807.p4II7BKA015222@farm-0002.internal.tilera.com>
Date: Tue, 17 May 2011 15:25:21 -0400
From: Chris Metcalf <cmetcalf@...era.com>
To: linux-kernel@...r.kernel.org
Subject: [PATCH] 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@...nel.org
Signed-off-by: Chris Metcalf <cmetcalf@...era.com>
---
arch/tile/kernel/pci.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 65add02..6d4cb5d 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -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;
@@ -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);
/*
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists