From: Prarit Bhargava <prarit@redhat.com>
Date: Wed, 14 May 2008 16:00:24 +0000 (-0400)
Subject: [IA64] Properly unregister legacy interrupts
X-Git-Tag: v2.6.26-rc3~29^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3fb2c74ee20b77affd494c6b8ce7928d0ebbb62e;p=linux-2.6-omap-h63xx.git

[IA64] Properly unregister legacy interrupts

acpi_unregister_gsi() should "undo" what acpi_register_gsi() does.

On systems that have legacy interrupts, acpi_unregister_gsi erroneously calls
iosapci_unregister_intr() which is wrong to do and causes a loud warning.

acpi_unregister_gsi() should just return in these cases.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 6ff6815d34e..853d1f11be0 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -627,6 +627,9 @@ void acpi_unregister_gsi(u32 gsi)
 	if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
 		return;
 
+	if (has_8259 && gsi < 16)
+		return;
+
 	iosapic_unregister_intr(gsi);
 }