From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Fri, 19 Nov 2010 02:38:17 +0000 (-0500)
Subject: Fix CAA_CAA -> CAA
X-Git-Tag: v0.5.1~3
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e040d717e072d02835605f7b5ff623cd6a123b7a;p=userspace-rcu.git

Fix CAA_CAA -> CAA

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

diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic_arch_x86.h
index 07b3244..ceb7a17 100644
--- a/urcu/uatomic_arch_x86.h
+++ b/urcu/uatomic_arch_x86.h
@@ -81,7 +81,7 @@ unsigned long __uatomic_cmpxchg(void *addr, unsigned long old,
 			: "memory");
 		return result;
 	}
-#if (CAA_CAA_BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result = old;
@@ -143,7 +143,7 @@ unsigned long __uatomic_exchange(void *addr, unsigned long val, int len)
 			: "memory");
 		return result;
 	}
-#if (CAA_CAA_BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result;
@@ -206,7 +206,7 @@ unsigned long __uatomic_add_return(void *addr, unsigned long val,
 			: "memory");
 		return result + (unsigned int)val;
 	}
-#if (CAA_CAA_BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result = val;
@@ -264,7 +264,7 @@ void __uatomic_add(void *addr, unsigned long val, int len)
 			: "memory");
 		return;
 	}
-#if (CAA_CAA_BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -319,7 +319,7 @@ void __uatomic_inc(void *addr, int len)
 			: "memory");
 		return;
 	}
-#if (CAA_CAA_BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -372,7 +372,7 @@ void __uatomic_dec(void *addr, int len)
 			: "memory");
 		return;
 	}
-#if (CAA_CAA_BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -392,7 +392,7 @@ void __uatomic_dec(void *addr, int len)
 
 #define _uatomic_dec(addr)	(__uatomic_dec((addr), sizeof(*(addr))))
 
-#if ((CAA_CAA_BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
+#if ((CAA_BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
 extern int __rcu_cas_avail;
 extern int __rcu_cas_init(void);