asm-arm/{arch-omap,arch-ixp23xx}: parentheses around NR_IRQS definition
PATCH 1/1 asm-arm/{arch-omap,arch-ixp23xx}: parentheses around NR_IRQS definition
in include/asm-arm/arch-omap/board-innovator.h:40
#define NR_IRQS IH_BOARD_BASE + NR_FPGA_IRQS
in include/asm-arm/arch-ixp23xx/irqs.h:156:
#define NR_IRQS NR_IXP23XX_IRQS + NR_IXP23XX_MACH_IRQS
This could lead to problems when this definition is used in:
arch/ia64/sn/kernel/irq.c:516:sn_irq_lh = kmalloc(sizeof(struct list_head *) * NR_IRQS, GFP_KERNEL); arch/x86/kernel/io_apic_32.c:693:
irq_cpu_data[i].irq_delta = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); 694:
irq_cpu_data[i].last_irq = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); 699:memset(irq_cpu_data[i].irq_delta,0,sizeof(unsigned long) * NR_IRQS); 700:memset(irq_cpu_data[i].last_irq,0,sizeof(unsigned long) * NR_IRQS); fs/proc/proc_misc.c:464:per_irq_sum = kzalloc(sizeof(unsigned int)*NR_IRQS, GFP_KERNEL);
I am not sure whether this definition actually is used in any of these files. Am I being paranoya? anyway, adding parentheses should be safe. --
Add parentheses to prevent operator precedence errors
---
include/asm-arm/arch-ixp23xx/irqs.h +1 -1
@@ -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
@@ -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);
Quoted 3 lines · Roel Kluin
Add parentheses to prevent operator precedence errors
Signed-off-by Roel Kluin <[email protected]>
For the arch-ixp23xx part I should have added:
Quoted 21 lines · Roel Kluin
in
include/asm-arm/arch-omap/board-innovator.h:40
#defineNR_IRQSIH_BOARD_BASE+NR_FPGA_IRQSin
include/asm-arm/arch-ixp23xx/irqs.h:156:
#defineNR_IRQSNR_IXP23XX_IRQS+NR_IXP23XX_MACH_IRQSThis could lead to problems when this definition is used in:
arch/ia64/sn/kernel/irq.c:516:sn_irq_lh=kmalloc(sizeof(struct list_head *) * NR_IRQS, GFP_KERNEL);arch/x86/kernel/io_apic_32.c:693:
irq_cpu_data[i].irq_delta =kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); 694:
irq_cpu_data[i].last_irq =kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); 699:memset(irq_cpu_data[i].irq_delta,0,sizeof(unsigned long) * NR_IRQS); 700:memset(irq_cpu_data[i].last_irq,0,sizeof(unsigned long) * NR_IRQS);fs/proc/proc_misc.c:464:per_irq_sum=kzalloc(sizeof(unsigned int)*NR_IRQS, GFP_KERNEL);
Quoted 6 lines
I am not sure whether this definition actually is used in any of these files. Am I being paranoya? anyway, adding parentheses should be safe. --
Add parentheses to prevent operator precedence errorsSigned-off-by Roel Kluin <[email protected]>
Please send to the ARM patch system.