Merge branch 'linus' into core/iommu

[karo-tx-linux.git] / include / linux / irqnr.h

diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index c4a59c7a478be5c20c1a04bb3d3538846dd262cf..86af92e9e84c0e3115845bcd3abbc125d28b5088 100644 (file)
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -8,7 +8,12 @@
 
 #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++)
@@ -22,10 +27,14 @@ extern struct irq_desc *irq_to_desc(unsigned int irq);
 
 # define for_each_irq_desc(irq, desc)                                  \
        for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs;           \
-            irq++, desc = irq_to_desc(irq))
+            irq++, desc = irq_to_desc(irq))                            \
+               if (desc)
+
+
 # define for_each_irq_desc_reverse(irq, desc)                          \
        for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0;      \
-            irq--, desc = irq_to_desc(irq))
+            irq--, desc = irq_to_desc(irq))                            \
+               if (desc)
 
 #endif /* CONFIG_GENERIC_HARDIRQS */