irq: initialize nr_irqs based on nr_cpu_ids

[linux-2.6-omap-h63xx.git] / include / linux / irqnr.h

diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 5504a5c97836d9fb4f1fb191cd6a11cdc131c22e..de66e4e1040650f5993421cbde33474387415513 100644 (file)
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -8,18 +8,30 @@
 
 #ifndef CONFIG_GENERIC_HARDIRQS
 #include <asm/irq.h>
-# define nr_irqs               NR_IRQS
+
+/*
+ * Wrappers for non-genirq architectures:
+ */
+#define nr_irqs                        NR_IRQS
+#define irq_to_desc(irq)       (&irq_desc[irq])
 
 # define for_each_irq_desc(irq, desc)          \
        for (irq = 0; irq < nr_irqs; irq++)
 
 # define for_each_irq_desc_reverse(irq, desc)                          \
        for (irq = nr_irqs - 1; irq >= 0; irq--)
+
 #else /* CONFIG_GENERIC_HARDIRQS */
 
+#include <asm/irq_vectors.h>   /* need possible max_nr_irqs() */
+
 extern int nr_irqs;
 extern struct irq_desc *irq_to_desc(unsigned int irq);
 
+# ifndef max_nr_irqs
+#  define max_nr_irqs(nr_cpus) NR_IRQS
+# endif
+
 # define for_each_irq_desc(irq, desc)                                  \
        for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs;           \
             irq++, desc = irq_to_desc(irq))                            \