aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/irq-gic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c
index a1dea3ea59a0..71cf45a335b6 100644
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
@@ -311,9 +311,10 @@ static void __init gic_setup_intr(unsigned int intr, unsigned int cpu,
311 311
312 /* Init Intr Masks */ 312 /* Init Intr Masks */
313 GIC_CLR_INTR_MASK(intr); 313 GIC_CLR_INTR_MASK(intr);
314
314 /* Initialise per-cpu Interrupt software masks */ 315 /* Initialise per-cpu Interrupt software masks */
315 if (flags & GIC_FLAG_IPI) 316 set_bit(intr, pcpu_masks[cpu].pcpu_mask);
316 set_bit(intr, pcpu_masks[cpu].pcpu_mask); 317
317 if ((flags & GIC_FLAG_TRANSPARENT) && (cpu_has_veic == 0)) 318 if ((flags & GIC_FLAG_TRANSPARENT) && (cpu_has_veic == 0))
318 GIC_SET_INTR_MASK(intr); 319 GIC_SET_INTR_MASK(intr);
319 if (trigtype == GIC_TRIG_EDGE) 320 if (trigtype == GIC_TRIG_EDGE)
@@ -352,8 +353,6 @@ static void __init gic_basic_init(int numintrs, int numvpes,
352 cpu = intrmap[i].cpunum; 353 cpu = intrmap[i].cpunum;
353 if (cpu == GIC_UNUSED) 354 if (cpu == GIC_UNUSED)
354 continue; 355 continue;
355 if (cpu == 0 && i != 0 && intrmap[i].flags == 0)
356 continue;
357 gic_setup_intr(i, 356 gic_setup_intr(i,
358 intrmap[i].cpunum, 357 intrmap[i].cpunum,
359 intrmap[i].pin + pin_offset, 358 intrmap[i].pin + pin_offset,