Fix RCU_GP_CTR_BIT

[urcu.git] / urcu.h

diff --git a/urcu.h b/urcu.h
index b8f6d9b29ab20a73b40b547261294c0f033c56e8..444d9cdba3346d987070dfa8fc68b78df4fe923f 100644 (file)
--- a/urcu.h
+++ b/urcu.h
@@ -165,9 +165,9 @@ static inline void debug_yield_init(void)
  * The trick here is that RCU_GP_CTR_BIT must be a multiple of 8 so we can use a
  * full 8-bits, 16-bits or 32-bits bitmask for the lower order bits.
  */
-#define RCU_GP_COUNT           (1U << 0)
+#define RCU_GP_COUNT           (1UL << 0)
 /* Use the amount of bits equal to half of the architecture long size */
-#define RCU_GP_CTR_BIT         (sizeof(long) << 2)
+#define RCU_GP_CTR_BIT         (1UL << (sizeof(long) << 2))
 #define RCU_GP_CTR_NEST_MASK   (RCU_GP_CTR_BIT - 1)
 
 /*
@@ -175,13 +175,13 @@ static inline void debug_yield_init(void)
  * Using a int rather than a char to eliminate false register dependencies
  * causing stalls on some architectures.
  */
-extern int urcu_gp_ctr;
+extern long urcu_gp_ctr;
 
-extern int __thread urcu_active_readers;
+extern long __thread urcu_active_readers;
 
 static inline int rcu_old_gp_ongoing(int *value)
 {
-       int v;
+       long v;
 
        if (value == NULL)
                return 0;
@@ -194,7 +194,7 @@ static inline int rcu_old_gp_ongoing(int *value)
 
 static inline void rcu_read_lock(void)
 {
-       int tmp;
+       long tmp;
 
        debug_yield_read();
        tmp = urcu_active_readers;