---

yaml --- r: 96799 b: refs/heads/master c: 3fb2c74 h: refs/heads/master i: 96797: b474756 96795: 9e33e48 96791: b3fea41 96783: 805f643 96767: efe6eac v: v3
git-mirror · May 14, 2008 · 69d67c3 · 69d67c3
1 parent 965bb90
commit 69d67c3
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: 7af1d7532b6cf905230c72c67ad85a480b122374
+refs/heads/master: 3fb2c74ee20b77affd494c6b8ce7928d0ebbb62e
diff --git 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);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
@@ Expand Down @@