diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-08 07:41:19 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 12:24:02 -0700 |
| commit | 7da5d406792eedb5341a8c20296470b2e67743e7 (patch) | |
| tree | e0bb0625be2631eb22b39526d7dd0c5543c1654e /arch/i386/pci | |
| parent | ca4aa09635516258f158a7bc1594a794e4c34864 (diff) | |
| download | op-kernel-dev-7da5d406792eedb5341a8c20296470b2e67743e7.zip op-kernel-dev-7da5d406792eedb5341a8c20296470b2e67743e7.tar.gz | |
[PATCH] 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@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/pci')
| -rw-r--r-- | 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_dev *dev) } 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; |
