* [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon
@ 2017-11-06 13:34 Arnd Bergmann
2017-11-06 20:47 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-11-06 13:34 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Arnd Bergmann, Russell King, Kees Cook, linux-arm-kernel, linux-kernel
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@linutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.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
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon
2017-11-06 13:34 [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon Arnd Bergmann
@ 2017-11-06 20:47 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2017-11-06 20:47 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Thomas Gleixner, Russell King, linux-arm-kernel, LKML
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@arndb.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@linutronix.de>
> Signed-off-by: Arnd Bergmann <arnd@arndb.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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-06 20:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-06 13:34 [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon Arnd Bergmann
2017-11-06 20:47 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).