diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 8649ef7..797c40b 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.75 2018/08/31 01:23:57 ozaki-r Exp
 do {								\
 	if (__predict_false(!(cond)))				\
 		MUTEX_ABORT(mtx, "assertion failed: " #cond);	\
-} while (/* CONSTCOND */ 0);
+} while (/* CONSTCOND */ 0)
 
 #else	/* LOCKDEBUG */
 
@@ -182,10 +182,10 @@ do {									\
 	(((int)(mtx)->mtx_owner & MUTEX_BIT_WAITERS) != 0)
 
 #define	MUTEX_INITIALIZE_ADAPTIVE(mtx, dodebug)				\
+do {									\
 	if (!dodebug)							\
 		(mtx)->mtx_owner |= MUTEX_BIT_NODEBUG;			\
-do {									\
-} while (/* CONSTCOND */ 0);
+} while (/* CONSTCOND */ 0)
 
 #define	MUTEX_INITIALIZE_SPIN(mtx, dodebug, ipl)			\
 do {									\
@@ -199,7 +199,7 @@ do {									\
 #define	MUTEX_DESTROY(mtx)						\
 do {									\
 	(mtx)->mtx_owner = MUTEX_THREAD;				\
-} while (/* CONSTCOND */ 0);
+} while (/* CONSTCOND */ 0)
 
 #define	MUTEX_SPIN_P(mtx)		\
     (((mtx)->mtx_owner & MUTEX_BIT_SPIN) != 0)