From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Fri, 19 Nov 2010 03:18:42 +0000 (-0500)
Subject: Fix get_cycles -> caa_get_cycles
X-Git-Tag: v0.5.2~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=71bce82c1a1ad4f5718a4de3d27bdf7c1945d4b7;p=userspace-rcu.git

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 51a1fff..d62ac17 100644
--- 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 6d58bb7..125066b 100644
--- 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 8e1a500..96efa0d 100644
--- 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 e1a8270..b0f5030 100644
--- 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 8d1483a..1f03c78 100644
--- 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 0752c4d..283a8f4 100644
--- 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 */
 }