]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 4680/1: parentheses around NR_IRQS definition
authorRoel Kluin <12o3l@tiscali.nl>
Thu, 29 Nov 2007 13:25:21 +0000 (14:25 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Nov 2007 20:56:57 +0000 (20:56 +0000)
If NR_IRQS is defined as a sum without surrounding parentheses, this may
lead to problems when used in multiplications. This may lead to problems
in:
arch/ia64/sn/kernel/irq.c:516
arch/x86/kernel/io_apic_32.c:693, 694, 699, 700
fs/proc/proc_misc.c:464

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
include/asm-arm/arch-ixp23xx/irqs.h
include/asm-arm/arch-omap/board-innovator.h

index e6963958572167bbc515d07302fa1c8253f47004..27c580898958f2ab96551b1417df33ce86f9179a 100644 (file)
  */
 #define NR_IXP23XX_MACH_IRQS           32
 
-#define NR_IRQS                                NR_IXP23XX_IRQS + NR_IXP23XX_MACH_IRQS
+#define NR_IRQS                                (NR_IXP23XX_IRQS + NR_IXP23XX_MACH_IRQS)
 
 #define IXP23XX_MACH_IRQ(irq)          (NR_IXP23XX_IRQ + (irq))
 
index b3cf33441f6e6915e991d6fa9e1cad314343d8b2..56d2c98e143c6abfcdbdd8c48314654cba16ee4e 100644 (file)
@@ -37,7 +37,7 @@
 #define OMAP1510P1_EMIFF_PRI_VALUE             0x00
 
 #define NR_FPGA_IRQS           24
-#define NR_IRQS                 IH_BOARD_BASE + NR_FPGA_IRQS
+#define NR_IRQS                 (IH_BOARD_BASE + NR_FPGA_IRQS)
 
 #ifndef __ASSEMBLY__
 void fpga_write(unsigned char val, int reg);