---

yaml --- r: 292763 b: refs/heads/master c: d450c08 h: refs/heads/master i: 292761: 1cdb76e 292759: 48247ad v: v3
git-mirror · Jan 26, 2012 · 77962af · 77962af
1 parent fb7b0b3
commit 77962af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3eea29c189a0e3e2ac921e85fabfa4989ee58d7
+refs/heads/master: d450c088fb00d5a744b1fe8648a488035a10a03c
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -1010,7 +1010,7 @@ static int pin_2_irq(int idx, int apic, int pin)
 	} else {
 		u32 gsi = gsi_cfg->gsi_base + pin;
 
-		if (gsi >= legacy_pic->nr_legacy_irqs)
+		if (gsi >= NR_IRQS_LEGACY)
 			irq = gsi;
 		else
 			irq = gsi_top + gsi;
@@ -3610,7 +3610,7 @@ static void __init probe_nr_irqs_gsi(void)
 {
 	int nr;
 
-	nr = gsi_top + legacy_pic->nr_legacy_irqs;
+	nr = gsi_top + NR_IRQS_LEGACY;
 	if (nr > nr_irqs_gsi)
 		nr_irqs_gsi = nr;