---

yaml --- r: 255259 b: refs/heads/master c: 97ffab1 h: refs/heads/master i: 255257: 772aa5e 255255: 6e3ea5c v: v3
git-mirror · Jul 11, 2011 · 449f558 · 449f558
1 parent 95c5c80
commit 449f558
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78316ada2222b5e3abc043eea7644e12319042d6
+refs/heads/master: 97ffab1f14638d2c95ad986ce735481d164a0bd2
diff --git a/trunk/arch/x86/pci/xen.c b/trunk/arch/x86/pci/xen.c
@@ -407,10 +407,9 @@ static __init void xen_setup_acpi_sci(void)
 	 * the ACPI interpreter and keels over since IRQ 9 has not been
 	 * setup as we had setup IRQ 20 for it).
 	 */
-	/* Check whether the GSI != IRQ */
 	if (acpi_gsi_to_irq(gsi, &irq) == 0) {
-		if (irq >= 0 && irq != gsi)
-			/* Bugger, we MUST have that IRQ. */
+		/* Use the provided value if it's valid. */
+		if (irq >= 0)
 			gsi_override = irq;
 	}