summaryrefslogtreecommitdiff
path: root/kernel/irq/internals.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-22 09:26:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-22 09:26:17 -0800
commit571020df6fae18623498d70d3f2331d9eb7ad2be (patch)
tree550df8ed0f30105d2251172491c0a11d6f885d4e /kernel/irq/internals.h
parentee88347755460e8ceb37e8453adcf5fd7ca5ff00 (diff)
parent6d83f94db95cfe65d2a6359cccdf61cf087c2598 (diff)
downloadlwn-571020df6fae18623498d70d3f2331d9eb7ad2be.tar.gz
lwn-571020df6fae18623498d70d3f2331d9eb7ad2be.zip
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Disable the SHIRQ_DEBUG call in request_threaded_irq for now genirq: Prevent access beyond allocated_irqs bitmap
Diffstat (limited to 'kernel/irq/internals.h')
-rw-r--r--kernel/irq/internals.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 4571ae7e085a..99c3bc8a6fb4 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -3,6 +3,12 @@
*/
#include <linux/irqdesc.h>
+#ifdef CONFIG_SPARSE_IRQ
+# define IRQ_BITMAP_BITS (NR_IRQS + 8196)
+#else
+# define IRQ_BITMAP_BITS NR_IRQS
+#endif
+
extern int noirqdebug;
#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)