Rename all memory primitives with prefix cmm_

[urcu.git] / urcu / arch_sparc64.h

diff --git a/urcu/arch_sparc64.h b/urcu/arch_sparc64.h
index 4d08d555a31fe4fb1cbfe99d17b57924ce9a2f95..39f27c7adb054b826d9e21b61712f1d817fcd215 100644 (file)
--- a/urcu/arch_sparc64.h
+++ b/urcu/arch_sparc64.h
@@ -5,13 +5,13 @@
  * arch_sparc64.h: trivial definitions for the Sparc64 architecture.
  *
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
-*
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -31,10 +31,6 @@ extern "C" {
 
 #define CACHE_LINE_SIZE        256
 
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG  (__SIZEOF_LONG__ * 8)
-#endif
-
 /*
  * Inspired from the Linux kernel. Workaround Spitfire bug #51.
  */
@@ -44,9 +40,9 @@ __asm__ __volatile__("ba,pt %%xcc, 1f\n\t"    \
                     "1:\n"                     \
                     : : : "memory")
 
-#define mb()    membar_safe("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")
-#define rmb()    membar_safe("#LoadLoad")
-#define wmb()    membar_safe("#StoreStore")
+#define cmm_mb()       membar_safe("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")
+#define cmm_rmb()      membar_safe("#LoadLoad")
+#define cmm_wmb()      membar_safe("#StoreStore")
 
 typedef unsigned long long cycles_t;