Index: kernel/arch/amd64/include/atomic.h
===================================================================
--- kernel/arch/amd64/include/atomic.h	(revision 68314757ea344753b0b4bc5489f6b6951ee87911)
+++ kernel/arch/amd64/include/atomic.h	(revision a1ef4c0316a72aaa438b90b4579cc5df65982f2b)
@@ -216,8 +216,11 @@
 #define local_atomic_cas(pptr, exp_val, new_val) \
 ({ \
-	typeof(*(pptr)) old_val; \
-	_atomic_cas_impl(pptr, exp_val, new_val, old_val, ""); \
+	/* Use proper types and avoid name clashes */ \
+	typeof(*(pptr)) _old_val_cas; \
+	typeof(*(pptr)) _exp_val_cas = exp_val; \
+	typeof(*(pptr)) _new_val_cas = new_val; \
+	_atomic_cas_impl(pptr, _exp_val_cas, _new_val_cas, _old_val_cas, ""); \
 	\
-	old_val; \
+	_old_val_cas; \
 })
 
@@ -236,13 +239,15 @@
 #define local_atomic_exchange(pptr, new_val) \
 ({ \
-	typeof(*(pptr)) exp_val; \
-	typeof(*(pptr)) old_val; \
+	/* Use proper types and avoid name clashes */ \
+	typeof(*(pptr)) _exp_val_x; \
+	typeof(*(pptr)) _old_val_x; \
+	typeof(*(pptr)) _new_val_x = new_val; \
 	\
 	do { \
-		exp_val = *pptr; \
-		old_val = local_atomic_cas(pptr, exp_val, new_val); \
-	} while (old_val != exp_val); \
+		_exp_val_x = *pptr; \
+		_old_val_x = local_atomic_cas(pptr, _exp_val_x, _new_val_x); \
+	} while (_old_val_x != _exp_val_x); \
 	\
-	old_val; \
+	_old_val_x; \
 })