X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fsystem.h;h=faae39055484875b237dd62dd0928e9903725da1;hp=0de7dd2e489f864e887552911f565500e6c9de0c;hb=b0a841b4ff807dd29fe0cdbfe24900312f0e627b;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e

diff --git a/urcu/system.h b/urcu/system.h
index 0de7dd2..faae390 100644
--- a/urcu/system.h
+++ b/urcu/system.h
@@ -8,47 +8,52 @@
  *
  * 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.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <urcu/compiler.h>
 #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 _CMM_LOAD_SHARED(p)	       CMM_ACCESS_ONCE(p)
 
 /*
  * Load a data from shared memory, doing a cache flush if required.
  */
-#define LOAD_SHARED(p)			\
+#define CMM_LOAD_SHARED(p)			\
+	__extension__			\
 	({				\
-		smp_rmc();		\
-		_LOAD_SHARED(p);	\
+		cmm_smp_rmc();		\
+		_CMM_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 _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 STORE_SHARED(x, v)		\
-	({				\
-		typeof(x) _v = _STORE_SHARED(x, v);	\
-		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 */