forked from luck/tmp_suning_uos_patched
irqchip/mips-gic: Use gic_vpes instead of NR_CPUS
NR_CPUS is set by Kconfig and could be much higher than what actually is in the system. gic_vpes should be a true representitives of the number of cpus in the system, so use it instead. Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Cc: <jason@lakedaemon.net> Cc: <marc.zyngier@arm.com> Cc: <jiang.liu@linux.intel.com> Cc: <linux-mips@linux-mips.org> Cc: <lisa.parratt@imgtec.com> Cc: Qais Yousef <qsyousef@gmail.com> Link: http://lkml.kernel.org/r/1449580830-23652-15-git-send-email-qais.yousef@imgtec.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
c98c1822ee
commit
2a07870511
|
@ -465,7 +465,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
|
||||||
gic_map_to_vpe(irq, mips_cm_vp_id(cpumask_first(&tmp)));
|
gic_map_to_vpe(irq, mips_cm_vp_id(cpumask_first(&tmp)));
|
||||||
|
|
||||||
/* Update the pcpu_masks */
|
/* Update the pcpu_masks */
|
||||||
for (i = 0; i < NR_CPUS; i++)
|
for (i = 0; i < gic_vpes; i++)
|
||||||
clear_bit(irq, pcpu_masks[i].pcpu_mask);
|
clear_bit(irq, pcpu_masks[i].pcpu_mask);
|
||||||
set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask);
|
set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask);
|
||||||
|
|
||||||
|
@ -1098,8 +1098,8 @@ static void __init __gic_init(unsigned long gic_base_addr,
|
||||||
|
|
||||||
gic_ipi_domain->bus_token = DOMAIN_BUS_IPI;
|
gic_ipi_domain->bus_token = DOMAIN_BUS_IPI;
|
||||||
|
|
||||||
/* Make the last 2 * NR_CPUS available for IPIs */
|
/* Make the last 2 * gic_vpes available for IPIs */
|
||||||
bitmap_set(ipi_resrv, gic_shared_intrs - 2 * NR_CPUS, 2 * NR_CPUS);
|
bitmap_set(ipi_resrv, gic_shared_intrs - 2 * gic_vpes, 2 * gic_vpes);
|
||||||
|
|
||||||
gic_basic_init();
|
gic_basic_init();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user