1 files changed, 25 insertions, 8 deletions

diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 452c280c8115..5504a5c97836 100644
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -1,24 +1,41 @@
 #ifndef _LINUX_IRQNR_H
 #define _LINUX_IRQNR_H
 
+/*
+ * Generic irq_desc iterators:
+ */
+#ifdef __KERNEL__
+
 #ifndef CONFIG_GENERIC_HARDIRQS
 #include <asm/irq.h>
 # define nr_irqs                NR_IRQS
 
 # define for_each_irq_desc(irq, desc)           \
         for (irq = 0; irq < nr_irqs; irq++)
-#else
+
+# define for_each_irq_desc_reverse(irq, desc)                          \
+        for (irq = nr_irqs - 1; irq >= 0; irq--)
+#else /* CONFIG_GENERIC_HARDIRQS */
+
 extern int nr_irqs;
+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))                            \
+                if (desc)
 
-# define for_each_irq_desc(irq, desc)           \
-        for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
 
 # define for_each_irq_desc_reverse(irq, desc)                           \
-        for (irq = nr_irqs - 1, desc = irq_desc + (nr_irqs - 1);        \
-             irq >= 0; irq--, desc--)
-#endif
+        for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0;      \
+             irq--, desc = irq_to_desc(irq))                            \
+                if (desc)
 
-#define for_each_irq_nr(irq)                    \
-        for (irq = 0; irq < nr_irqs; irq++)
+#endif /* CONFIG_GENERIC_HARDIRQS */
+
+#define for_each_irq_nr(irq)                   \
+       for (irq = 0; irq < nr_irqs; irq++)
+
+#endif /* __KERNEL__ */
 
 #endif