* [PATCH 01/36] m68k: compile fix - hardirq checks were in wrong place
@ 2005-12-22 4:49 Al Viro
0 siblings, 0 replies; only message in thread
From: Al Viro @ 2005-12-22 4:49 UTC (permalink / raw)
To: linux-m68k; +Cc: linux-kernel
From: Al Viro <viro@zeniv.linux.org.uk>
Date: 1133435630 -0500
move the sanity check for NR_IRQS being no more than 1<<HARDIRQ_BITS
from asm-m68k/hardirq.h to asm-m68k/irq.h; needed since NR_IRQS is
not necessary know at the points of inclusion of asm/hardirq.h due
to the rather ugly header dependencies on m68k. Fix is by far simpler
than trying to massage those dependencies...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
include/asm-m68k/hardirq.h | 9 ---------
include/asm-m68k/irq.h | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
37a063583b48f497bfc6d8862106cfcd438e0f3c
diff --git a/include/asm-m68k/hardirq.h b/include/asm-m68k/hardirq.h
index 728318b..5e1c582 100644
--- a/include/asm-m68k/hardirq.h
+++ b/include/asm-m68k/hardirq.h
@@ -14,13 +14,4 @@ typedef struct {
#define HARDIRQ_BITS 8
-/*
- * 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
-
#endif
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 1f56990..d312674 100644
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -23,6 +23,15 @@
#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.
* Adding an interrupt service routine for one of these sources
--
0.99.9.GIT
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2005-12-22 4:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-12-22 4:49 [PATCH 01/36] m68k: compile fix - hardirq checks were in wrong place Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).