Here's the ia64 part of the ACPI IRQ cleanup I proposed here: http://www.gelato.unsw.edu.au/linux-ia64/0403/8979.html After the arch bits are in, I'll post the corresponding ACPI changes. I removed the "Found IRQ" printk now because when the ACPI change goes in, dev->irq won't be initialized until *after* acpi_pci_irq_enable(). ===== arch/ia64/kernel/acpi.c 1.65 vs edited ===== --- 1.65/arch/ia64/kernel/acpi.c Sat Mar 20 22:28:40 2004 +++ edited/arch/ia64/kernel/acpi.c Mon Apr 5 11:23:32 2004 @@ -527,7 +527,7 @@ if (fadt->iapc_boot_arch & BAF_LEGACY_DEVICES) acpi_legacy_devices = 1; - acpi_register_irq(fadt->sci_int, ACPI_ACTIVE_LOW, ACPI_LEVEL_SENSITIVE); + acpi_register_gsi(fadt->sci_int, ACPI_ACTIVE_LOW, ACPI_LEVEL_SENSITIVE); return 0; } @@ -662,5 +662,12 @@ (trigger == ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE : IOSAPIC_LEVEL); } EXPORT_SYMBOL(acpi_register_irq); + +unsigned int +acpi_register_gsi (u32 gsi, int polarity, int trigger) +{ + return acpi_register_irq(gsi, polarity, trigger); +} +EXPORT_SYMBOL(acpi_register_gsi); #endif /* CONFIG_ACPI_BOOT */ ===== arch/ia64/pci/pci.c 1.45 vs edited ===== --- 1.45/arch/ia64/pci/pci.c Tue Mar 23 18:55:32 2004 +++ edited/arch/ia64/pci/pci.c Mon Apr 5 15:21:56 2004 @@ -441,7 +441,6 @@ if (ret < 0) return ret; - printk(KERN_INFO "PCI: Found IRQ %d for device %s\n", dev->irq, pci_name(dev)); return acpi_pci_irq_enable(dev); } - To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Tue Apr 6 17:25:25 2004
This archive was generated by hypermail 2.1.8 : 2005-08-02 09:20:25 EST