From 425b0533787fdb79e8bec76a8644bb31c508acfe Mon Sep 17 00:00:00 2001
From: Andy Grover <agrover@groveronline.com>
Date: Tue, 12 Aug 2003 20:03:58 -0700
Subject: [PATCH] ACPI: Fix ACPI for IA64 on Big Sur machines (HJ Lu)

---
 drivers/acpi/osl.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 192858a3f4d80..7c7332bd2c641 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -251,7 +251,12 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context)
 	irq = acpi_fadt.sci_int;
 
 #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
 	acpi_irq_irq = irq;
 	acpi_irq_handler = handler;
@@ -269,7 +274,7 @@ acpi_os_remove_interrupt_handler(u32 irq, OSD_HANDLER handler)
 {
 	if (acpi_irq_handler) {
 #ifdef CONFIG_IA64
-		irq = gsi_to_vector(irq);
+		irq = acpi_irq_to_vector(irq);
 #endif
 		free_irq(irq, acpi_irq);
 		acpi_irq_handler = NULL;
-- 
2.53.0