2021-01-05 09:24:56

by Keqian Zhu

Subject: [PATCH] arm64/smp: Remove unused variable irq in arch_show_interrupts()

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 <[email protected]>
---
arch/arm64/kernel/smp.c | 1 -
1 file changed, 1 deletion(-)

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)
--
2.19.1

2021-01-05 12:28:53

by Catalin Marinas

Subject: Re: [PATCH] arm64/smp: Remove unused variable irq in arch_show_interrupts()

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 <[email protected]>

I already queued a similar fix in arm64 for-next/fixes (it should appear
in linux-next at some point).

--
Catalin

2021-01-05 12:33:40

by Keqian Zhu

Subject: Re: [PATCH] arm64/smp: Remove unused variable irq in arch_show_interrupts()

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 <[email protected]>
>
> I already queued a similar fix in arm64 for-next/fixes (it should appear
> in linux-next at some point).
>
OK, I see. Thanks.

2021-01-05 12:43:22

by Anshuman Khandual

Subject: Re: [PATCH] arm64/smp: Remove unused variable irq in arch_show_interrupts()

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 <[email protected]>
>
> 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.