Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: GIC: Move GIC_NUM_INTRS into platform irq.h

The value of GIC_NUM_INTRS is platform-specific. Using a default value
from gic.h will result in incorrect behaviour on some systems, so
require a suitable definition to be present in the platform's irq.h.

Signed-off-by: Jeffrey Deans <jeffrey.deans@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7373/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Jeffrey Deans and committed by
Ralf Baechle
c9750481 822350bc

+4 -2
+2 -2
arch/mips/include/asm/gic.h
··· 14 14 #include <linux/bitmap.h> 15 15 #include <linux/threads.h> 16 16 17 + #include <irq.h> 18 + 17 19 #undef GICISBYTELITTLEENDIAN 18 20 19 21 /* Constants */ ··· 23 21 #define GIC_POL_NEG 0 24 22 #define GIC_TRIG_EDGE 1 25 23 #define GIC_TRIG_LEVEL 0 26 - 27 - #define GIC_NUM_INTRS (24 + NR_CPUS * 2) 28 24 29 25 #define MSK(n) ((1 << (n)) - 1) 30 26 #define REG32(addr) (*(volatile unsigned int *) (addr))
+1
arch/mips/include/asm/mach-malta/irq.h
··· 2 2 #define __ASM_MACH_MIPS_IRQ_H 3 3 4 4 5 + #define GIC_NUM_INTRS (24 + NR_CPUS * 2) 5 6 #define NR_IRQS 256 6 7 7 8 #include_next <irq.h>
+1
arch/mips/include/asm/mach-sead3/irq.h
··· 1 1 #ifndef __ASM_MACH_MIPS_IRQ_H 2 2 #define __ASM_MACH_MIPS_IRQ_H 3 3 4 + #define GIC_NUM_INTRS (24 + NR_CPUS * 2) 4 5 #define NR_IRQS 256 5 6 6 7