X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fsystem.h;h=e0186066db0975930f4d778c1e45de46246deb5e;hp=0c3152f63f20f018df833c269efc0df531f3b682;hb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be;hpb=f152776dbd7d8cf072160d4d0229e1c3e4ea6f1c

diff --git a/urcu/system.h b/urcu/system.h
index 0c3152f..e018606 100644
--- 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,32 +22,32 @@
 #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)
+#define _CAA_LOAD_SHARED(p)	       CAA_ACCESS_ONCE(p)
 
 /*
  * Load a data from shared memory, doing a cache flush if required.
  */
-#define LOAD_SHARED(p)			\
+#define CAA_LOAD_SHARED(p)			\
 	({				\
-		smp_rmc();		\
-		_LOAD_SHARED(p);	\
+		cmm_smp_rmc();		\
+		_CAA_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); })
+#define _CAA_STORE_SHARED(x, v)	({ CAA_ACCESS_ONCE(x) = (v); })
 
 /*
  * Store v into x, where x is located in shared memory. Performs the required
  * cache flush after writing. Returns v.
  */
-#define STORE_SHARED(x, v)		\
+#define CAA_STORE_SHARED(x, v)		\
 	({				\
-		typeof(x) _v = _STORE_SHARED(x, v);	\
-		smp_wmc();		\
+		typeof(x) _v = _CAA_STORE_SHARED(x, v);	\
+		cmm_smp_wmc();		\
 		_v;			\
 	})