---

yaml --- r: 46060 b: refs/heads/master c: 7225394 h: refs/heads/master v: v3
git-mirror · Feb 3, 2007 · 0f2be29 · 0f2be29
1 parent 0deb254
commit 0f2be29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
@@ Expand Down @@