Commit 425b0533 authored by Andy Grover's avatar Andy Grover Committed by Len Brown

ACPI: Fix ACPI for IA64 on Big Sur machines (HJ Lu)

parent 12a91a48
...@@ -251,7 +251,12 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context) ...@@ -251,7 +251,12 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context)
irq = acpi_fadt.sci_int; irq = acpi_fadt.sci_int;
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
irq = gsi_to_vector(irq); irq = acpi_irq_to_vector(irq);
if (irq < 0) {
printk(KERN_ERR PREFIX "SCI (ACPI interrupt %d) not registered\n",
acpi_fadt.sci_int);
return AE_OK;
}
#endif #endif
acpi_irq_irq = irq; acpi_irq_irq = irq;
acpi_irq_handler = handler; acpi_irq_handler = handler;
...@@ -269,7 +274,7 @@ acpi_os_remove_interrupt_handler(u32 irq, OSD_HANDLER handler) ...@@ -269,7 +274,7 @@ acpi_os_remove_interrupt_handler(u32 irq, OSD_HANDLER handler)
{ {
if (acpi_irq_handler) { if (acpi_irq_handler) {
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
irq = gsi_to_vector(irq); irq = acpi_irq_to_vector(irq);
#endif #endif
free_irq(irq, acpi_irq); free_irq(irq, acpi_irq);
acpi_irq_handler = NULL; acpi_irq_handler = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment