[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <m1fydzudq8.fsf_-_@ebiederm.dsl.xmission.com>
Date: Sun, 08 Oct 2006 07:41:19 -0600
From: ebiederm@...ssion.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@...l.org>
Cc: Muli Ben-Yehuda <muli@...ibm.com>, Ingo Molnar <mingo@...e.hu>,
Thomas Gleixner <tglx@...utronix.de>, Andi Kleen <ak@....de>,
"Protasevich, Natalie" <Natalie.Protasevich@...SYS.com>,
Andrew Morton <akpm@...l.org>,
Linux-Kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH 1/3] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number
In commit: ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b I removed
the weird logic that used the vector number as the irq number
when MSI was defined. However pci_enable_irq was using a different test
in the io_apic_assign_irqs path and I missed it :(
This patch removes the wrong code so no one hits this problem.
This code is only active when a specific set of boot command line
parameters is specified which likely explains why no one has
notices this earlier.
Signed-off-by: Eric W. Biederman <ebiederm@...ssion.com>
---
arch/i386/pci/irq.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 47f02af..dbc4aae 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -1141,10 +1141,6 @@ static int pirq_enable_irq(struct pci_de
}
dev = temp_dev;
if (irq >= 0) {
-#ifdef CONFIG_PCI_MSI
- if (!platform_legacy_irq(irq))
- irq = IO_APIC_VECTOR(irq);
-#endif
printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
pci_name(dev), 'A' + pin, irq);
dev->irq = irq;
--
1.4.2.rc3.g7e18e-dirty
-
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