Fix get_cycles -> caa_get_cycles

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu/arch_alpha.h b/urcu/arch_alpha.h
index 51a1fff2f70a29fe216a58c5f2c894022f17edfa..d62ac177cf58e110a15131f1926e813776995eba 100644 (file)
--- a/urcu/arch_alpha.h
+++ b/urcu/arch_alpha.h
@@ -34,7 +34,7 @@ extern "C" {
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        return 0;       /* not supported */
 }

diff --git a/urcu/arch_armv7l.h b/urcu/arch_armv7l.h
index 6d58bb7017248396cf0b046863edab8c620148ac..125066b8239190b5be4580c11ba406a7baa8be7e 100644 (file)
--- a/urcu/arch_armv7l.h
+++ b/urcu/arch_armv7l.h
@@ -36,7 +36,7 @@ extern "C" {
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        cycles_t thetime;
        struct timeval tv;

diff --git a/urcu/arch_gcc.h b/urcu/arch_gcc.h
index 8e1a50093495fd5c2cd64878d7390268632f1637..96efa0d2d8300fad55206cd58e649b23afec0626 100644 (file)
--- a/urcu/arch_gcc.h
+++ b/urcu/arch_gcc.h
@@ -34,7 +34,7 @@ extern "C" {
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        cycles_t thetime;
        struct timeval tv;

diff --git a/urcu/arch_ppc.h b/urcu/arch_ppc.h
index e1a827044aa424ead1d48510eb6b90a7e598b1a6..b0f503001eef91fc3faa85c78e938f78f8440a20 100644 (file)
--- a/urcu/arch_ppc.h
+++ b/urcu/arch_ppc.h
@@ -50,7 +50,7 @@ extern "C" {
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        long h, l;
 

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 8d1483abb4aff07c4b129c3e758887af58468ee5..1f03c784cb32bcc3da7c4c724b5fc7eaf632c501 100644 (file)
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -41,7 +41,7 @@ extern "C" {
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        cycles_t cycles;
 

diff --git a/urcu/arch_sparc64.h b/urcu/arch_sparc64.h
index 0752c4d7a04cac6041cac1be52ad4316b526897e..283a8f482f018b755b5fd739472c9d4efceb6c0a 100644 (file)
--- a/urcu/arch_sparc64.h
+++ b/urcu/arch_sparc64.h
@@ -46,7 +46,7 @@ __asm__ __volatile__("ba,pt %%xcc, 1f\n\t"    \
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        return 0;       /* unimplemented */
 }