From: Arnd Bergmann <arnd@arndb.de>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>,
Russell King <linux@armlinux.org.uk>,
Kees Cook <keescook@chromium.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon
Date: Mon, 6 Nov 2017 14:34:01 +0100 [thread overview]
Message-ID: <20171106133410.467203-1-arnd@arndb.de> (raw)
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
next reply other threads:[~2017-11-06 13:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-06 13:34 Arnd Bergmann [this message]
2017-11-06 20:47 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171106133410.467203-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®