2014-10-19 18:04:35

by Stefan Hengelein

[permalink] [raw]
Subject: [PATCH] MIPS: MSP71xx: remove compilation error

When CONFIG_MIPS_MT_SMP is enabled, the following compilation error
occurs:

arch/mips/pmcs-msp71xx/msp_irq_cic.c:134: error: ‘irq’ undeclared

This code clearly never saw a compiler.
The surrounding code suggests, that 'd->irq' was intended, not
'irq'.

This error was found with vampyr.

Signed-off-by: Stefan Hengelein <[email protected]>
---
arch/mips/pmcs-msp71xx/msp_irq_cic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/pmcs-msp71xx/msp_irq_cic.c b/arch/mips/pmcs-msp71xx/msp_irq_cic.c
index b8df2f7..1207ec4 100644
--- a/arch/mips/pmcs-msp71xx/msp_irq_cic.c
+++ b/arch/mips/pmcs-msp71xx/msp_irq_cic.c
@@ -131,11 +131,11 @@ static int msp_cic_irq_set_affinity(struct irq_data *d,
int cpu;
unsigned long flags;
unsigned int mtflags;
- unsigned long imask = (1 << (irq - MSP_CIC_INTBASE));
+ unsigned long imask = (1 << (d->irq - MSP_CIC_INTBASE));
volatile u32 *cic_mask = (volatile u32 *)CIC_VPE0_MSK_REG;

/* timer balancing should be disabled in kernel code */
- BUG_ON(irq == MSP_INT_VPE0_TIMER || irq == MSP_INT_VPE1_TIMER);
+ BUG_ON(d->irq == MSP_INT_VPE0_TIMER || d->irq == MSP_INT_VPE1_TIMER);

LOCK_CORE(flags, mtflags);
/* enable if any of each VPE's TCs require this IRQ */
--
1.9.1


2014-10-20 07:21:46

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] MIPS: MSP71xx: remove compilation error

On Sun, Oct 19, 2014 at 8:04 PM, Stefan Hengelein
<[email protected]> wrote:
> When CONFIG_MIPS_MT_SMP is enabled, the following compilation error
> occurs:
>
> arch/mips/pmcs-msp71xx/msp_irq_cic.c:134: error: ‘irq’ undeclared
>
> This code clearly never saw a compiler.
> The surrounding code suggests, that 'd->irq' was intended, not
> 'irq'.
>
> This error was found with vampyr.
>
> Signed-off-by: Stefan Hengelein <[email protected]>

Acked-by: Geert Uytterhoeven <[email protected]>
Fixes: d7881fbdf866d7d0 ("MIPS: msp71xx: Convert to new irq_chip functions")

(from 2011 ;-)

> ---
> arch/mips/pmcs-msp71xx/msp_irq_cic.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/pmcs-msp71xx/msp_irq_cic.c b/arch/mips/pmcs-msp71xx/msp_irq_cic.c
> index b8df2f7..1207ec4 100644
> --- a/arch/mips/pmcs-msp71xx/msp_irq_cic.c
> +++ b/arch/mips/pmcs-msp71xx/msp_irq_cic.c
> @@ -131,11 +131,11 @@ static int msp_cic_irq_set_affinity(struct irq_data *d,
> int cpu;
> unsigned long flags;
> unsigned int mtflags;
> - unsigned long imask = (1 << (irq - MSP_CIC_INTBASE));
> + unsigned long imask = (1 << (d->irq - MSP_CIC_INTBASE));
> volatile u32 *cic_mask = (volatile u32 *)CIC_VPE0_MSK_REG;
>
> /* timer balancing should be disabled in kernel code */
> - BUG_ON(irq == MSP_INT_VPE0_TIMER || irq == MSP_INT_VPE1_TIMER);
> + BUG_ON(d->irq == MSP_INT_VPE0_TIMER || d->irq == MSP_INT_VPE1_TIMER);
>
> LOCK_CORE(flags, mtflags);
> /* enable if any of each VPE's TCs require this IRQ */

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds