The following commit has been merged into the irq/core branch of tip: Commit-ID: 220387048d859896ccc362c0ebf9bc1e0fa62eb9 Gitweb: https://git.kernel.org/tip/220387048d859896ccc362c0ebf9bc1e0fa62eb9 Author: Marc Zyngier <[email protected]> AuthorDate: Fri, 25 Sep 2020 16:22:00 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Mon, 28 Sep 2020 11:32:04 +01:00
ARM: Handle no IPI being registered in show_ipi_list() As SMP-on-UP is a valid configuration on 32bit ARM, do not assume that IPIs are populated in show_ipi_list(). Reported-by: Guillaume Tucker <[email protected]> Reported-by: kernelci.org bot <[email protected]> Tested-by: Guillaume Tucker <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> --- arch/arm/kernel/smp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 8425da5..48099c6 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -541,7 +541,12 @@ void show_ipi_list(struct seq_file *p, int prec) unsigned int cpu, i; for (i = 0; i < NR_IPI; i++) { - unsigned int irq = irq_desc_get_irq(ipi_desc[i]); + unsigned int irq; + + if (!ipi_desc[i]) + continue; + + irq = irq_desc_get_irq(ipi_desc[i]); seq_printf(p, "%*s%u: ", prec - 1, "IPI", i); for_each_online_cpu(cpu)
