Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98aa6864 authored by Roel Kluin's avatar Roel Kluin Committed by Russell King
Browse files

[ARM] 4680/1: parentheses around NR_IRQS definition 



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: default avatarRoel Kluin <12o3l@tiscali.nl>
Acked-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d28a170d

include/asm-arm/arch-ixp23xx/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 
 */

#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))

include/asm-arm/arch-omap/board-innovator.h

+1 −1
Original line number Diff line number Diff line
@@ -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);