diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h
index c9028f932a80..4b2610ca54f0 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic.h
@@ -205,31 +205,31 @@ atomic_cmpxchg(atomic_t *v, int old, int new)
 		u16 u16[0];						\
 		u32 u32[0];						\
 		u64 u64[0];						\
-	} __ret = { .val = READ_ONCE(*ptr) }, __new = { .val = (new) };	\
+	} __ret, __new = { .val = (new) };				\
 									\
 	CTASSERT(sizeof(__ret.val) == 1 || sizeof(__ret.val) == 2 ||	\
 	    sizeof(__ret.val) == 4 || sizeof(__ret.val) == 8);		\
 									\
 	switch (sizeof(__ret.val)) {					\
 	case 1:								\
+		__ret.val = READ_ONCE(*ptr);				\
 		while (!atomic_fcmpset_8((volatile u8 *)(ptr),		\
 	            __ret.u8, __new.u8[0]))				\
 			;						\
 		break;							\
 	case 2:								\
+		__ret.val = READ_ONCE(*ptr);				\
 		while (!atomic_fcmpset_16((volatile u16 *)(ptr),	\
 	            __ret.u16, __new.u16[0]))				\
 			;						\
 		break;							\
 	case 4:								\
-		while (!atomic_fcmpset_32((volatile u32 *)(ptr),	\
-	            __ret.u32, __new.u32[0]))				\
-			;						\
+		__ret.u32[0] = atomic_swap_32((volatile u32 *)(ptr),	\
+		    __new.u32[0]);					\
 		break;							\
 	case 8:								\
-		while (!atomic_fcmpset_64((volatile u64 *)(ptr),	\
-	            __ret.u64, __new.u64[0]))				\
-			;						\
+		__ret.u64[0] = atomic_swap_64((volatile u64 *)(ptr),	\
+		    __new.u64[0]);					\
 		break;							\
 	}								\
 	__ret.val;							\