[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110616000230.077672327@clark.kroah.org>
Date: Wed, 15 Jun 2011 16:59:34 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Chris Metcalf <cmetcalf@...era.com>
Subject: [11/89] arch/tile: allocate PCI IRQs later in boot
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
From: Chris Metcalf <cmetcalf@...era.com>
commit f4de51de2edcd26ec77bfc71b1f00b1de5a5dc20 upstream.
This change became required due to some recent reworking in the
platform-independent IRQ code. It is required for 2.6.38 and later.
Signed-off-by: Chris Metcalf <cmetcalf@...era.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
arch/tile/kernel/pci.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -179,12 +179,6 @@ int __init tile_pci_init(void)
controller = &controllers[num_controllers];
- if (tile_init_irqs(i, controller)) {
- pr_err("PCI: Could not initialize "
- "IRQs, aborting.\n");
- goto err_cont;
- }
-
controller->index = num_controllers;
controller->hv_cfg_fd[0] = hv_cfg_fd0;
controller->hv_cfg_fd[1] = hv_cfg_fd1;
@@ -300,6 +294,11 @@ static int __init 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);
/*
--
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