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

MIPS: GIC: Remove dependencies from Malta files.

This prevents the GIC code from being reusable sanely.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

+5 -5
+1
arch/mips/include/asm/gic.h
··· 321 321 */ 322 322 struct gic_intr_map { 323 323 unsigned int cpunum; /* Directed to this CPU */ 324 + #define GIC_UNUSED 0xdead /* Dummy data */ 324 325 unsigned int pin; /* Directed to this Pin */ 325 326 unsigned int polarity; /* Polarity : +/- */ 326 327 unsigned int trigtype; /* Trigger : Edge/Levl */
-3
arch/mips/include/asm/mips-boards/maltaint.h
··· 88 88 89 89 #define GIC_EXT_INTR(x) x 90 90 91 - /* Dummy data */ 92 - #define X 0xdead 93 - 94 91 /* External Interrupts used for IPI */ 95 92 #define GIC_IPI_EXT_INTR_RESCHED_VPE0 16 96 93 #define GIC_IPI_EXT_INTR_CALLFNC_VPE0 17
+1 -2
arch/mips/kernel/irq-gic.c
··· 7 7 #include <asm/io.h> 8 8 #include <asm/gic.h> 9 9 #include <asm/gcmpregs.h> 10 - #include <asm/mips-boards/maltaint.h> 11 10 #include <asm/irq.h> 12 11 #include <linux/hardirq.h> 13 12 #include <asm-generic/bitops/find.h> ··· 221 222 /* Setup specifics */ 222 223 for (i = 0; i < mapsize; i++) { 223 224 cpu = intrmap[i].cpunum; 224 - if (cpu == X) 225 + if (cpu == GIC_UNUSED) 225 226 continue; 226 227 if (cpu == 0 && i != 0 && intrmap[i].flags == 0) 227 228 continue;
+3
arch/mips/mti-malta/malta-int.c
··· 385 385 */ 386 386 387 387 #define GIC_CPU_NMI GIC_MAP_TO_NMI_MSK 388 + #define X GIC_UNUSED 389 + 388 390 static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = { 389 391 { X, X, X, X, 0 }, 390 392 { X, X, X, X, 0 }, ··· 406 404 { X, X, X, X, 0 }, 407 405 /* The remainder of this table is initialised by fill_ipi_map */ 408 406 }; 407 + #undef X 409 408 410 409 /* 411 410 * GCMP needs to be detected before any SMP initialisation