From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 14 May 2010 00:15:10 +0000 (-0400)
Subject: urcu-qsbr: use same ongoing helper for 32 and 64 bits
X-Git-Tag: v0.4.4~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=af147b83c4f67d99e6582f15eea5cb2ae51b8d36;p=userspace-rcu.git

urcu-qsbr: use same ongoing helper for 32 and 64 bits

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

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 125301f..86f0fc5 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -155,15 +155,6 @@ static inline void wake_up_gp(void)
 	}
 }
 
-#if (BITS_PER_LONG < 64)
-static inline int rcu_gp_ongoing(unsigned long *ctr)
-{
-	unsigned long v;
-
-	v = LOAD_SHARED(*ctr);
-	return v && ((v ^ rcu_gp_ctr) & RCU_GP_CTR);
-}
-#else /* !(BITS_PER_LONG < 64) */
 static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
 	unsigned long v;
@@ -171,7 +162,6 @@ static inline int rcu_gp_ongoing(unsigned long *ctr)
 	v = LOAD_SHARED(*ctr);
 	return v && (v != rcu_gp_ctr);
 }
-#endif  /* !(BITS_PER_LONG < 64) */
 
 static inline void _rcu_read_lock(void)
 {