Fix missing BITS_PER_LONG -> CAA_BITS_PER_LONG rename

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

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index b7c42fdb0c35deb37e8c5d76a4593746206df0d9..607e6aee1f44adbb48d8f569e2be26b414d6c93c 100644 (file)
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -112,13 +112,13 @@ static void update_counter_and_wait(void)
        int wait_loops = 0;
        struct rcu_reader *index, *tmp;
 
-#if (BITS_PER_LONG < 64)
+#if (CAA_BITS_PER_LONG < 64)
        /* Switch parity: 0 -> 1, 1 -> 0 */
        CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR);
-#else  /* !(BITS_PER_LONG < 64) */
+#else  /* !(CAA_BITS_PER_LONG < 64) */
        /* Increment current G.P. */
        CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR);
-#endif /* !(BITS_PER_LONG < 64) */
+#endif /* !(CAA_BITS_PER_LONG < 64) */
 
        /*
         * Must commit rcu_gp_ctr update to memory before waiting for quiescent
@@ -179,7 +179,7 @@ static void update_counter_and_wait(void)
  * long-size to ensure we do not encounter an overflow bug.
  */
 
-#if (BITS_PER_LONG < 64)
+#if (CAA_BITS_PER_LONG < 64)
 void synchronize_rcu(void)
 {
        unsigned long was_online;
@@ -241,7 +241,7 @@ out:
                _CAA_STORE_SHARED(rcu_reader.ctr, CAA_LOAD_SHARED(rcu_gp_ctr));
        cmm_smp_mb();
 }
-#else /* !(BITS_PER_LONG < 64) */
+#else /* !(CAA_BITS_PER_LONG < 64) */
 void synchronize_rcu(void)
 {
        unsigned long was_online;
@@ -268,7 +268,7 @@ out:
                _CAA_STORE_SHARED(rcu_reader.ctr, CAA_LOAD_SHARED(rcu_gp_ctr));
        cmm_smp_mb();
 }
-#endif  /* !(BITS_PER_LONG < 64) */
+#endif  /* !(CAA_BITS_PER_LONG < 64) */
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.

diff --git a/urcu/uatomic_arch_ppc.h b/urcu/uatomic_arch_ppc.h
index 710ce054e86514093f45024c573fdd3e33f58230..426b0f243f95cf63cdd0439c22aaa356609955da 100644 (file)
--- a/urcu/uatomic_arch_ppc.h
+++ b/urcu/uatomic_arch_ppc.h
@@ -64,7 +64,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 
                return result;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long result;
@@ -119,7 +119,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 
                return old_val;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long old_val;
@@ -178,7 +178,7 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 
                return result;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long result;

diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic_arch_s390.h
index 75025b1e7699e9498ee2653737ce1511509f8d87..2a4fa03e66cedb8d32488ae9e659ef886e76d88f 100644 (file)
--- a/urcu/uatomic_arch_s390.h
+++ b/urcu/uatomic_arch_s390.h
@@ -84,7 +84,7 @@ unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
                        : "memory", "cc");
                return old_val;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long old_val;
@@ -127,7 +127,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
                        : "memory", "cc");
                return old_val;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                __asm__ __volatile__(

diff --git a/urcu/uatomic_arch_sparc64.h b/urcu/uatomic_arch_sparc64.h
index 399ac120a5a64e37874845801e9d645bd4d26638..082c84750e17498b9c1c2fb7eb0b60dde919aec6 100644 (file)
--- a/urcu/uatomic_arch_sparc64.h
+++ b/urcu/uatomic_arch_sparc64.h
@@ -46,7 +46,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 
                return _new;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                __asm__ __volatile__ (

diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic_arch_x86.h
index 4e09afd7195aaa835a1478df76a7e9b0e508ff16..07b3244fd190b648babad23fe2c87e95ada57b9b 100644 (file)
--- 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 (BITS_PER_LONG == 64)
+#if (CAA_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 (BITS_PER_LONG == 64)
+#if (CAA_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 (BITS_PER_LONG == 64)
+#if (CAA_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 (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
        case 8:
        {
                __asm__ __volatile__(
@@ -319,7 +319,7 @@ void __uatomic_inc(void *addr, int len)
                        : "memory");
                return;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
        case 8:
        {
                __asm__ __volatile__(
@@ -372,7 +372,7 @@ void __uatomic_dec(void *addr, int len)
                        : "memory");
                return;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_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 ((BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
+#if ((CAA_CAA_BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
 extern int __rcu_cas_avail;
 extern int __rcu_cas_init(void);
 

diff --git a/urcu/uatomic_generic.h b/urcu/uatomic_generic.h
index 6b4ef9e8ddb8e0ab1eabca7e1541e421ba87adbe..ced61913c5b0552a1da7580333347902ce0ba6b0 100644 (file)
--- a/urcu/uatomic_generic.h
+++ b/urcu/uatomic_generic.h
@@ -71,7 +71,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 #endif
        case 4:
                return __sync_val_compare_and_swap_4(addr, old, _new);
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
                return __sync_val_compare_and_swap_8(addr, old, _new);
 #endif
@@ -105,7 +105,7 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 #endif
        case 4:
                return __sync_add_and_fetch_4(addr, val);
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
                return __sync_add_and_fetch_8(addr, val);
 #endif
@@ -162,7 +162,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 
                return old;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long old;
@@ -233,7 +233,7 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
 
                return old + val;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long old, oldt;
@@ -305,7 +305,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 
                return old;
        }
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
        case 8:
        {
                unsigned long old, oldt;