Re: [ACPI] Fw: [Bugme-new] [Bug 4496] New: Interrupt-problem depends on sound-playing: irq 10: nobody cared!

[Bjorn H. <bjo...@hp...>]

On Monday 30 May 2005 2:48 pm, Hannes Diethelm wrote:
> Ok, i'm running 2.6.12-rc5-mm1 now. I've tryed your patches but i'm not
> able to aply those patches...

At least one of the patches you tried to apply was already
in 2.6.12-rc5-mm1, so that caused some rejects.

Can you start again with 2.6.12-rc5-mm1, and apply the following
patch?

Thanks for your helpful testing reports.  I really appreciate the
work you're doing.

Bjorn


--- 2.6.12-rc5-mm1/drivers/pci/quirks.c.orig	2005-05-31 09:42:17.000000000 -0600
+++ 2.6.12-rc5-mm1/drivers/pci/quirks.c	2005-05-31 09:44:07.000000000 -0600
@@ -499,28 +499,20 @@
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C586_3,	quirk_via_acpi );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686_4,	quirk_via_acpi );
 
-static void __devinit quirk_via_irqpic(struct pci_dev *dev)
+static void quirk_via_irq(struct pci_dev *dev)
 {
 	u8 irq, new_irq;
 
-#ifdef CONFIG_X86_IO_APIC
-	if (nr_ioapics && !skip_ioapic_setup)
-		return;
-#endif
-#ifdef CONFIG_ACPI
-	if (acpi_irq_model != ACPI_IRQ_MODEL_PIC)
-		return;
-#endif
 	new_irq = dev->irq & 0xf;
 	pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
 	if (new_irq != irq) {
-		printk(KERN_INFO "PCI: Via PIC IRQ fixup for %s, from %d to %d\n",
+		printk(KERN_INFO "PCI: Via IRQ fixup for %s, from %d to %d\n",
 			pci_name(dev), irq, new_irq);
 		udelay(15);	/* unknown if delay really needed */
 		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
 	}
 }
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irqpic);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
 
 /*
  * PIIX3 USB: We have to disable USB interrupts that are