Skip to content

Commit

Permalink
[PATCH] m68k: compile fix - hardirq checks were in wrong place
Browse files Browse the repository at this point in the history
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>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent f5a61d0 commit 85b07cd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
9 changes: 0 additions & 9 deletions include/asm-m68k/hardirq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions include/asm-m68k/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 85b07cd

Please sign in to comment.