Fix: handle sys_futex() FUTEX_WAIT interrupted by signal

[urcu.git] / urcu / system.h

diff --git a/urcu/system.h b/urcu/system.h
index 38e8ecc771b345c1e463742a446b62f90cbad8d7..faae39055484875b237dd62dd0928e9903725da1 100644 (file)
--- a/urcu/system.h
+++ b/urcu/system.h
@@ -23,7 +23,8 @@
 #include <urcu/arch.h>
 
 /*
- * Identify a shared load. A cmm_smp_rmc() or cmm_smp_mc() should come before the load.
+ * Identify a shared load. A cmm_smp_rmc() or cmm_smp_mc() should come
+ * before the load.
  */
 #define _CMM_LOAD_SHARED(p)           CMM_ACCESS_ONCE(p)
 
@@ -31,25 +32,28 @@
  * Load a data from shared memory, doing a cache flush if required.
  */
 #define CMM_LOAD_SHARED(p)                     \
+       __extension__                   \
        ({                              \
                cmm_smp_rmc();          \
                _CMM_LOAD_SHARED(p);    \
        })
 
 /*
- * Identify a shared store. A cmm_smp_wmc() or cmm_smp_mc() should follow the store.
+ * Identify a shared store. A cmm_smp_wmc() or cmm_smp_mc() should
+ * follow the store.
  */
-#define _CMM_STORE_SHARED(x, v)        ({ CMM_ACCESS_ONCE(x) = (v); })
+#define _CMM_STORE_SHARED(x, v)        __extension__ ({ CMM_ACCESS_ONCE(x) = (v); })
 
 /*
- * Store v into x, where x is located in shared memory. Performs the required
- * cache flush after writing. Returns v.
+ * Store v into x, where x is located in shared memory. Performs the
+ * required cache flush after writing. Returns v.
  */
-#define CMM_STORE_SHARED(x, v)         \
-       ({                              \
-               typeof(x) _v = _CMM_STORE_SHARED(x, v); \
-               cmm_smp_wmc();          \
-               _v;                     \
+#define CMM_STORE_SHARED(x, v)                                         \
+       __extension__                                                   \
+       ({                                                              \
+               __typeof__(x) _v = _CMM_STORE_SHARED(x, v);             \
+               cmm_smp_wmc();                                          \
+               _v = _v;        /* Work around clang "unused result" */ \
        })
 
 #endif /* _URCU_SYSTEM_H */