From: Al Viro Date: Thu, 12 Jan 2006 09:06:10 +0000 (-0800) Subject: [PATCH] m68k: compile fix - hardirq checks were in wrong place X-Git-Tag: v2.6.16-rc1~224 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85b07cd1aa50aca8331e5dfe3b2ccb2eb391b183;p=linux-2.6 [PATCH] m68k: compile fix - hardirq checks were in wrong place move the sanity check for NR_IRQS being no more than 1< Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-m68k/hardirq.h b/include/asm-m68k/hardirq.h index 728318bf7f..5e1c5826c8 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 127ad190cf..325c86f851 100644 --- 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.