[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAGXu5jLC7rEpvh_XG1B3zVoGh6b35sG=DJd49dim5JY74HSEmA@mail.gmail.com>
Date: Mon, 6 Nov 2017 12:47:25 -0800
From: Kees Cook <keescook@...omium.org>
To: Arnd Bergmann <arnd@...db.de>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Russell King <linux@...linux.org.uk>,
linux-arm-kernel@...ts.infradead.org,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon
Thanks! I noticed the report just before I saw your email. :) This
should be fixed in tip soon.
-Kees
On Mon, Nov 6, 2017 at 5:34 AM, Arnd Bergmann <arnd@...db.de> wrote:
> The timer_setup() conversion included a small typo that breaks the
> build:
>
> arch/arm/mach-footbridge/dc21285.c: In function 'dc21285_enable_error':
> arch/arm/mach-footbridge/dc21285.c:145:2: error: expected ';' before 'else'
> else if (timer == &perr_timer)
>
> Fixes: b7bea32f0cc4 ("ARM: footbridge: Convert timers to use timer_setup()")
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
> The broken patch is currently in -tip and came in through timers-conversion-next3.
> Please apply this one on top, or fold it into the original patch if possible
> ---
> arch/arm/mach-footbridge/dc21285.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
> index 8407e4a07c77..e7b350f18f5f 100644
> --- a/arch/arm/mach-footbridge/dc21285.c
> +++ b/arch/arm/mach-footbridge/dc21285.c
> @@ -141,7 +141,7 @@ static void dc21285_enable_error(struct timer_list *timer)
> del_timer(timer);
>
> if (timer == &serr_timer)
> - enable_irq(IRQ_PCI_SERR)
> + enable_irq(IRQ_PCI_SERR);
> else if (timer == &perr_timer)
> enable_irq(IRQ_PCI_PERR);
> }
> --
> 2.9.0
>
--
Kees Cook
Pixel Security
Powered by blists - more mailing lists