Index: kernel/generic/include/atomic.h
===================================================================
--- kernel/generic/include/atomic.h	(revision cc74cb5c5f69f9cd7b915a29908ded2daedb158d)
+++ kernel/generic/include/atomic.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -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