| Message ID | 20210105092221.15144-1-zhukeqian1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64/smp: Remove unused variable irq in arch_show_interrupts() | expand |
On Tue, Jan 05, 2021 at 05:22:21PM +0800, Keqian Zhu wrote: > The local variable irq is added in commit a26388152531 ("arm64: > Remove custom IRQ stat accounting"), but forget to remove in > commit 5089bc51f81f ("arm64/smp: Use irq_desc_kstat_cpu() in > arch_show_interrupts()"). Just remove it. > > Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> I already queued a similar fix in arm64 for-next/fixes (it should appear in linux-next at some point).
On 2021/1/5 18:08, Catalin Marinas wrote: > On Tue, Jan 05, 2021 at 05:22:21PM +0800, Keqian Zhu wrote: >> The local variable irq is added in commit a26388152531 ("arm64: >> Remove custom IRQ stat accounting"), but forget to remove in >> commit 5089bc51f81f ("arm64/smp: Use irq_desc_kstat_cpu() in >> arch_show_interrupts()"). Just remove it. >> >> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> > > I already queued a similar fix in arm64 for-next/fixes (it should appear > in linux-next at some point). > OK, I see. Thanks.
On 1/5/21 3:38 PM, Catalin Marinas wrote: > On Tue, Jan 05, 2021 at 05:22:21PM +0800, Keqian Zhu wrote: >> The local variable irq is added in commit a26388152531 ("arm64: >> Remove custom IRQ stat accounting"), but forget to remove in >> commit 5089bc51f81f ("arm64/smp: Use irq_desc_kstat_cpu() in >> arch_show_interrupts()"). Just remove it. >> >> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> > > I already queued a similar fix in arm64 for-next/fixes (it should appear > in linux-next at some point) I too sent this fix yesterday as well :) as it was preventing a clean build on v5.11-rc2. Missed to check this on arm64 for-next/fixes though I did check on linux-next.
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 6bc3a3698c3d..376343d6f13a 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -807,7 +807,6 @@ int arch_show_interrupts(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]); seq_printf(p, "%*s%u:%s", prec - 1, "IPI", i, prec >= 4 ? " " : ""); for_each_online_cpu(cpu)
The local variable irq is added in commit a26388152531 ("arm64: Remove custom IRQ stat accounting"), but forget to remove in commit 5089bc51f81f ("arm64/smp: Use irq_desc_kstat_cpu() in arch_show_interrupts()"). Just remove it. Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> --- arch/arm64/kernel/smp.c | 1 - 1 file changed, 1 deletion(-)