Changeset a1ef4c0 in mainline

Timestamp:

2012-11-22T23:35:33Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

02ee69da

Parents:

94b39ba

Message:

Fixed type mismatch in local_atomic_exchange() on amd64, ia32. Fixes build of amd64.

Location:

kernel/arch

Files:

• amd64/include/atomic.h (modified) (2 diffs)
• ia32/include/atomic.h (modified) (2 diffs)

kernel/arch/amd64/include/atomic.h

@@ -216 +216 @@
 #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 +239 @@
 #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; \
 })
 

kernel/arch/ia32/include/atomic.h

@@ -203 +203 @@
 #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; \
 })
 
@@ -223 +226 @@
 #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; \
 })