X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr-static.h;h=041361799b89694b8f9e8c9f7af0d142d040a44e;hp=9f3a9b99f3c36ded7961cdeb3eadc102bba0f51d;hb=6982d6d71aeed16d2d929bd0ed221e8f444b706e;hpb=e26fa029fb2db4c2f3746a3bfe46e9a0eeeb41a7

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 9f3a9b9..0413617 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-qsbr.h for linking
  * dynamically with the userspace rcu QSBR library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -135,7 +135,7 @@ struct rcu_reader {
 	/* Data used by both reader and synchronize_rcu() */
 	unsigned long ctr;
 	/* Data used for registry */
-	struct list_head head __attribute__((aligned(CACHE_LINE_SIZE)));
+	struct list_head node __attribute__((aligned(CACHE_LINE_SIZE)));
 	pthread_t tid;
 };
 
@@ -155,23 +155,13 @@ 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);
+	return v && (v != rcu_gp_ctr);
 }
-#else /* !(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 > ULONG_MAX / 2);
-}
-#endif  /* !(BITS_PER_LONG < 64) */
 
 static inline void _rcu_read_lock(void)
 {