This is a note to let you know that I've just added the patch titled
arch/tile: allocate PCI IRQs later in boot
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arch-tile-allocate-pci-irqs-later-in-boot.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From f4de51de2edcd26ec77bfc71b1f00b1de5a5dc20 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <[email protected]>
Date: Tue, 17 May 2011 15:25:21 -0400
Subject: arch/tile: allocate PCI IRQs later in boot
From: Chris Metcalf <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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);
/*
Patches currently in stable-queue which might be from [email protected] are
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
