Pull sn2-mmio-writes into release branch

[linux-2.6-omap-h63xx.git] / include / asm-m68k / irq.h

diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 127ad190cf2d6e895dd8c2d4990c750a1b6b94bd..9ac047c400c45654b927374b23536971ae57b4cf 100644 (file)
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -22,6 +22,15 @@
 #define NR_IRQS (24+SYS_IRQS)
 #endif
 
+/*
+ * The hardirq mask has to be large enough to have
+ * space for potentially all IRQ sources in the system
+ * nesting on a single CPU:
+ */
+#if (1 << HARDIRQ_BITS) < NR_IRQS
+# error HARDIRQ_BITS is too low!
+#endif
+
 /*
  * Interrupt source definitions
  * General interrupt sources are the level 1-7.
@@ -70,7 +79,7 @@ static __inline__ int irq_canonicalize(int irq)
 
 extern void (*enable_irq)(unsigned int);
 extern void (*disable_irq)(unsigned int);
-#define enable_irq_nosync      enable_irq
+#define disable_irq_nosync     disable_irq
 
 struct pt_regs;