From 0f2be297c50783aaa2c3544ca04365b9bdbc6599 Mon Sep 17 00:00:00 2001
From: John Keller <jpk@sgi.com>
Date: Sat, 3 Feb 2007 01:14:02 -0800
Subject: [PATCH] --- yaml --- r: 46060 b: refs/heads/master c:
 72253943f7281fc5c6249d9cafd63e7de3266fe9 h: refs/heads/master 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 eb6c077d9096..4795c253a128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2e895dbd80c420bfc0937c3729b4afe073b3848
+refs/heads/master: 72253943f7281fc5c6249d9cafd63e7de3266fe9
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
index ef2fe474f107..29f05d4b68cd 100644
--- a/trunk/arch/ia64/kernel/acpi.c
+++ b/trunk/arch/ia64/kernel/acpi.c
@@ -609,6 +609,9 @@ EXPORT_SYMBOL(acpi_register_gsi);
 
 void acpi_unregister_gsi(u32 gsi)
 {
+	if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
+		return;
+
 	iosapic_unregister_intr(gsi);
 }