Rename all memory primitives with prefix cmm_

[urcu.git] / urcu-pointer-static.h

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index 093630a084f84ba7c5917a5621ee3fe1de3af258..c8ac7f0c0861a2d80e20e935dddf99303693fa75 100644 (file)
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-pointer.h for
  * linking dynamically with the userspace rcu library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -63,7 +63,7 @@ extern "C" {
 
 #define _rcu_dereference(p)     ({                                     \
                                typeof(p) _________p1 = LOAD_SHARED(p); \
-                               smp_read_barrier_depends();             \
+                               cmm_smp_read_barrier_depends();         \
                                (_________p1);                          \
                                })
 
@@ -81,7 +81,7 @@ extern "C" {
                typeof(*p) _________pnew = (_new);                      \
                if (!__builtin_constant_p(_new) ||                      \
                    ((_new) != NULL))                                   \
-                       wmb();                                          \
+                       cmm_wmb();                                              \
                uatomic_cmpxchg(p, _________pold, _________pnew);       \
        })
 
@@ -96,7 +96,7 @@ extern "C" {
                typeof(*p) _________pv = (v);           \
                if (!__builtin_constant_p(v) ||         \
                    ((v) != NULL))                      \
-                       wmb();                          \
+                       cmm_wmb();                              \
                uatomic_xchg(p, _________pv);           \
        })
 
@@ -106,7 +106,7 @@ extern "C" {
                typeof(*p) _________pv = (v);           \
                if (!__builtin_constant_p(v) ||         \
                    ((v) != NULL))                      \
-                       wmb();                          \
+                       cmm_wmb();                              \
                uatomic_set(p, _________pv);            \
        })