From 69d67c32d6ebaa8189a06fe7c7914dd268cd9201 Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Wed, 14 May 2008 12:00:24 -0400
Subject: [PATCH] --- yaml --- r: 96799 b: refs/heads/master c:
 3fb2c74ee20b77affd494c6b8ce7928d0ebbb62e h: refs/heads/master i:   96797:
 b4747564481f2a2ea9d624ca201b02e42a98521f   96795:
 9e33e48b973e58451391fc48d28a012f6e4a2103   96791:
 b3fea415324f933238b7130e85e7f9fdda1a7566   96783:
 805f6431d034700c93e201624f13d4ed291adc00   96767:
 efe6eac1b13d4165ea7da1b73ef8fbbb2457d897 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/kernel/acpi.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 298df3c7914b..5b21d04b85a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7af1d7532b6cf905230c72c67ad85a480b122374
+refs/heads/master: 3fb2c74ee20b77affd494c6b8ce7928d0ebbb62e
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
index 6ff6815d34ef..853d1f11be00 100644
--- a/trunk/arch/ia64/kernel/acpi.c
+++ b/trunk/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);
 }