Update email address from @polymtl.ca to @efficios.com

[urcu.git] / urcu-static.h

diff --git a/urcu-static.h b/urcu-static.h
index 1eeb2e6b03319c313d051ef71a3148add48ff264..56c853d57c440d49e7559b76a4f178bbcfa959d6 100644 (file)
--- a/urcu-static.h
+++ b/urcu-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu.h for linking
  * dynamically with the userspace rcu 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
@@ -59,7 +59,7 @@ extern "C" {
 # define MEMBARRIER_EXPEDITED          (1 << 0)
 # define MEMBARRIER_DELAYED            (1 << 1)
 # define MEMBARRIER_QUERY              (1 << 16)
-# define membarrier(...)               syscall(__NR_membarrier, __VA_ARGS__)
+# define membarrier(...)               syscall(SYS_membarrier, __VA_ARGS__)
 #else
 # undef RCU_MEMBARRIER
 # define RCU_MB
@@ -222,7 +222,7 @@ struct rcu_reader {
        unsigned long ctr;
        char need_mb;
        /* 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;
 };
 
@@ -242,17 +242,15 @@ static inline void wake_up_gp(void)
        }
 }
 
-static inline int rcu_gp_ongoing(unsigned long *value)
+static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
        unsigned long v;
 
-       if (value == NULL)
-               return 0;
        /*
         * Make sure both tests below are done on the same version of *value
         * to insure consistency.
         */
-       v = LOAD_SHARED(*value);
+       v = LOAD_SHARED(*ctr);
        return (v & RCU_GP_CTR_NEST_MASK) &&
                 ((v ^ rcu_gp_ctr) & RCU_GP_CTR_PHASE);
 }