Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1541296

[PATCH 4.8 30/33] m68k: Fix ndelay() macro

Show all headers | View raw

4.8-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) */

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 20/33] crypto: marvell - Dont copy hash operation twice into the SRAM Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 33/33] crypto: rsa - Add Makefile dependencies to fix parallel builds Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 32/33] hotplug: Make register and unregister notifier API symmetric Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 02/33] powerpc/mm: Fix lazy icache flush on pre-POWER5 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 17/33] acpi, nfit, libnvdimm: fix / harden ars_status output length handling Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 28/33] ARM: dts: imx7d: fix LCDIF clock assignment Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 30/33] m68k: Fix ndelay() macro Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 31/33] batman-adv: Check for alloc errors when preparing TT local data Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 05/33] parisc: Purge TLB before setting PTE Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 10/33] locking/rtmutex: Use READ_ONCE() in rt_mutex_owner() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 22/33] crypto: mcryptd - Check mcryptd algorithm compatibility Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 06/33] parisc: Remove unnecessary TLB purges from flush_dcache_page_asm and flush_icache_page_asm Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 16/33] acpi, nfit: fix extended status translations for ACPI DSMs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 14/33] vhost-vsock: fix orphan connection reset Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 04/33] fuse: fix clearing suid, sgid for chown() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 23/33] crypto: marvell - Dont corrupt state of an STD req for re-stepped ahash Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 08/33] zram: restrict add/remove attributes to root only Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 07/33] parisc: Fix TLB related boot crash on SMP machines Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 15/33] perf/x86: Fix full width counter, counter overflow Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 11/33] device-dax: fix private mapping restriction, permit read-only Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 09/33] locking/rtmutex: Prevent dequeue vs. unlock race Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 18/33] acpi, nfit: validate ars_status output buffer size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 13/33] sched/autogroup: Fix 64-bit kernel nice level adjustment Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 26/33] Revert "ACPI: Execute _PTS before system reboot" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 03/33] powerpc/boot: Fix build failure in 32-bit boot wrapper Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 12/33] scsi: lpfc: fix oops/BUG in lpfc_sli_ringtxcmpl_put() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 24/33] can: raw: raw_setsockopt: limit number of can_filter that can be set Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  Re: [PATCH 4.8 00/33] 4.8.15-stable review Shuah Khan <shuah.kh@samsung.com> - 2016-12-13 20:40 +0100
    Re: [PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 21:10 +0100
  Re: [PATCH 4.8 00/33] 4.8.15-stable review Guenter Roeck <linux@roeck-us.net> - 2016-12-14 05:20 +0100
    Re: [PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-14 13:50 +0100

csiph-web