From 77962af73cfc0ff3444aec8fde5f608812e86575 Mon Sep 17 00:00:00 2001 From: Jacob Pan Date: Thu, 26 Jan 2012 17:32:33 +0000 Subject: [PATCH] --- yaml --- r: 292763 b: refs/heads/master c: d450c088fb00d5a744b1fe8648a488035a10a03c h: refs/heads/master i: 292761: 1cdb76e687af02193b6d7b799a3e81ef811884cc 292759: 48247ad9c2bea53cb9344a255adcf2fe323612fe v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/io_apic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 833979765c04..bae896ee4c25 100644 --- 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 index 9e753663f0d1..fb072754bc1d 100644 --- 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;