Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / io_apic.c

diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 6f80dc2f137e14f5848623e8f4cb9bcb46b62332..7a3f2028e2eb9e01a757a93b0de5b2e4f77f3634 100644 (file)
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -2277,9 +2277,7 @@ static void ack_apic_edge(unsigned int irq)
        ack_APIC_irq();
 }
 
-#ifdef CONFIG_X86_32
 atomic_t irq_mis_count;
-#endif
 
 static void ack_apic_level(unsigned int irq)
 {
@@ -3613,6 +3611,8 @@ int __init probe_nr_irqs(void)
        /* something wrong ? */
        if (nr < nr_min)
                nr = nr_min;
+       if (WARN_ON(nr > NR_IRQS))
+               nr = NR_IRQS;
 
        return nr;
 }