Rename all memory primitives with prefix cmm_

[urcu.git] / urcu / arch_ppc.h

diff --git a/urcu/arch_ppc.h b/urcu/arch_ppc.h
index 7a217c837dfb1cba0aad10ee0495e4d9adddd6e6..93aed2a72f0c06b0f4a0cc68c0365f30ca150017 100644 (file)
--- a/urcu/arch_ppc.h
+++ b/urcu/arch_ppc.h
@@ -32,7 +32,7 @@ extern "C" {
 /* Include size of POWER5+ L3 cache lines: 256 bytes */
 #define CACHE_LINE_SIZE        256
 
-#define mb()    asm volatile("sync":::"memory")
+#define cmm_mb()    asm volatile("sync":::"memory")
 
 #define mftbl()                                                \
        ({                                              \
@@ -56,9 +56,9 @@ static inline cycles_t get_cycles (void)
 
        for (;;) {
                h = mftbu();
-               barrier();
+               cmm_barrier();
                l = mftbl();
-               barrier();
+               cmm_barrier();
                if (mftbu() == h)
                        return (((cycles_t) h) << 32) + l;
        }