Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=98aa686494f92e881869f76bfb734cbb1f53cb13
Commit:     98aa686494f92e881869f76bfb734cbb1f53cb13
Parent:     d28a170d5b67248d690df68d46491ee2cf6f4f6d
Author:     Roel Kluin <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 29 14:25:21 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Thu Nov 29 20:56:57 2007 +0000

    [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: Roel Kluin <[EMAIL PROTECTED]>
    Acked-by: Lennert Buytenhek <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-ixp23xx/irqs.h         |    2 +-
 include/asm-arm/arch-omap/board-innovator.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-arm/arch-ixp23xx/irqs.h 
b/include/asm-arm/arch-ixp23xx/irqs.h
index e696395..27c5808 100644
--- a/include/asm-arm/arch-ixp23xx/irqs.h
+++ b/include/asm-arm/arch-ixp23xx/irqs.h
@@ -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))
 
diff --git a/include/asm-arm/arch-omap/board-innovator.h 
b/include/asm-arm/arch-omap/board-innovator.h
index b3cf334..56d2c98 100644
--- a/include/asm-arm/arch-omap/board-innovator.h
+++ b/include/asm-arm/arch-omap/board-innovator.h
@@ -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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to