From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 4.4 13/16] m68k: Fix ndelay() macro
Date: Tue, 13 Dec 2016 09:15:59 -0800 [thread overview]
Message-ID: <20161213171519.548249339@linuxfoundation.org> (raw)
In-Reply-To: <20161213171518.862135257@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <boris.brezillon@free-electrons.com>
commit 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa upstream.
The current ndelay() macro definition has an extra semi-colon at the
end of the line thus leading to a compilation error when ndelay is used
in a conditional block without curly braces like this one:
if (cond)
ndelay(t);
else
...
which, after the preprocessor pass gives:
if (cond)
m68k_ndelay(t);;
else
...
thus leading to the following gcc error:
error: 'else' without a previous 'if'
Remove this extra semi-colon.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: c8ee038bd1488 ("m68k: Implement ndelay() based on the existing udelay() logic")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/m68k/include/asm/delay.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/m68k/include/asm/delay.h
+++ b/arch/m68k/include/asm/delay.h
@@ -114,6 +114,6 @@ static inline void __udelay(unsigned lon
*/
#define HZSCALE (268435456 / (1000000 / HZ))
-#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
+#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
#endif /* defined(_M68K_DELAY_H) */
next prev parent reply other threads:[~2016-12-13 17:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161213171600epcas4p21d6115c640ff49376b44fb19568af7f4@epcas4p2.samsung.com>
2016-12-13 17:15 ` [PATCH 4.4 00/16] 4.4.39-stable review Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 01/16] powerpc/eeh: Fix deadlock when PE frozen state cant be cleared Greg Kroah-Hartman
2016-12-13 23:59 ` Andrew Donnellan
2016-12-14 1:01 ` Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 02/16] parisc: Purge TLB before setting PTE Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 03/16] parisc: Remove unnecessary TLB purges from flush_dcache_page_asm and flush_icache_page_asm Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 04/16] parisc: Fix TLB related boot crash on SMP machines Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 05/16] zram: restrict add/remove attributes to root only Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 06/16] locking/rtmutex: Prevent dequeue vs. unlock race Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 07/16] locking/rtmutex: Use READ_ONCE() in rt_mutex_owner() Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 08/16] perf/x86: Fix full width counter, counter overflow Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 09/16] crypto: mcryptd - Check mcryptd algorithm compatibility Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 10/16] can: raw: raw_setsockopt: limit number of can_filter that can be set Greg Kroah-Hartman
2016-12-13 17:15 ` [PATCH 4.4 12/16] arm64: futex.h: Add missing PAN toggling Greg Kroah-Hartman
2016-12-13 17:15 ` Greg Kroah-Hartman [this message]
2016-12-13 17:16 ` [PATCH 4.4 14/16] batman-adv: Check for alloc errors when preparing TT local data Greg Kroah-Hartman
2016-12-13 17:16 ` [PATCH 4.4 15/16] hotplug: Make register and unregister notifier API symmetric Greg Kroah-Hartman
2016-12-13 17:16 ` [PATCH 4.4 16/16] crypto: rsa - Add Makefile dependencies to fix parallel builds Greg Kroah-Hartman
2016-12-13 19:31 ` [PATCH 4.4 00/16] 4.4.39-stable review Shuah Khan
2016-12-14 4:11 ` Guenter Roeck
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=20161213171519.548249339@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=boris.brezillon@free-electrons.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).