Rename all memory primitives with prefix cmm_

[urcu.git] / urcu / system.h

diff --git a/urcu/system.h b/urcu/system.h
index e36a13baf51dc79a8ad9b31351a75a1c3ed775b6..11a499ec96629488d4a878fa9c6e4733600212c5 100644 (file)
--- a/urcu/system.h
+++ b/urcu/system.h
@@ -6,7 +6,7 @@
  *
  * System definitions.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
  * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -22,7 +22,7 @@
 #include <urcu/arch.h>
 
 /*
- * Identify a shared load. A smp_rmc() or 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 _LOAD_SHARED(p)               ACCESS_ONCE(p)
 
@@ -31,12 +31,12 @@
  */
 #define LOAD_SHARED(p)                 \
        ({                              \
-               smp_rmc();              \
+               cmm_smp_rmc();          \
                _LOAD_SHARED(p);        \
        })
 
 /*
- * Identify a shared store. A smp_wmc() or smp_mc() should follow the store.
+ * Identify a shared store. A cmm_smp_wmc() or cmm_smp_mc() should follow the store.
  */
 #define _STORE_SHARED(x, v)    ({ ACCESS_ONCE(x) = (v); })
 
@@ -46,9 +46,9 @@
  */
 #define STORE_SHARED(x, v)             \
        ({                              \
-               _STORE_SHARED(x, v);    \
-               smp_wmc();              \
-               (v);                    \
+               typeof(x) _v = _STORE_SHARED(x, v);     \
+               cmm_smp_wmc();          \
+               _v;                     \
        })
 
 #endif /* _URCU_SYSTEM_H */