The patch below does not apply to the .39-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From f4de51de2edcd26ec77bfc71b1f00b1de5a5dc20 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <[email protected]>
Date: Tue, 17 May 2011 15:25:21 -0400
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: [email protected]
Signed-off-by: Chris Metcalf <[email protected]>

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);
 
                        /*

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to