Index: kernel/generic/include/atomic.h
===================================================================
--- kernel/generic/include/atomic.h	(revision c53e8137d0d1c1adfead47ccfe6351383d8d6af2)
+++ kernel/generic/include/atomic.h	(revision 631281dedb2b080d5b5af149d4e4b05369d66c34)
@@ -68,5 +68,7 @@
 
 #define local_atomic_exchange(var_addr, new_val) \
-	atomic_exchange_explicit(var_addr, new_val, memory_order_relaxed)
+	atomic_exchange_explicit( \
+	    (_Atomic typeof(*(var_addr)) *) (var_addr), \
+	    (new_val), memory_order_relaxed)
 
 #endif