Cleanup DEFINE_RCU_FLAVOR()

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

diff --git a/urcu-bp.c b/urcu-bp.c
index 912e9b2ea31ad7c42d46a8f9d31f88f6d46a4361..08b4b55d46b97a353f177fc38114a8f350ae43f5 100644 (file)
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -444,7 +444,7 @@ void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new)
        return uatomic_cmpxchg(p, old, _new);
 }
 
-DEFINE_RCU_FLAVOR()
+DEFINE_RCU_FLAVOR(rcu_flavor);
 
 #include "urcu-call-rcu-impl.h"
 #include "urcu-defer-impl.h"

diff --git a/urcu-flavor.h b/urcu-flavor.h
index e46c9a19beb73538a4274973a958e0b8546ea75e..9af4d0e632b291799a49a747d7f6bcb1f05efc60 100644 (file)
--- a/urcu-flavor.h
+++ b/urcu-flavor.h
@@ -42,8 +42,8 @@ struct rcu_flavor_struct {
        void (*unregister_thread)(void);
 };
 
-#define DEFINE_RCU_FLAVOR()                            \
-const struct rcu_flavor_struct rcu_flavor = {          \
+#define DEFINE_RCU_FLAVOR(x)                           \
+const struct rcu_flavor_struct x = {                   \
        .read_lock              = rcu_read_lock,        \
        .read_unlock            = rcu_read_unlock,      \
        .read_quiescent_state   = rcu_quiescent_state,  \
@@ -54,7 +54,7 @@ const struct rcu_flavor_struct rcu_flavor = {         \
        .thread_online          = rcu_thread_online,    \
        .register_thread        = rcu_register_thread,  \
        .unregister_thread      = rcu_unregister_thread,\
-};
+}
 
 extern const struct rcu_flavor_struct rcu_flavor;
 

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index 06e81c7bbbbe47ad5eb4b0b40bf81be55d8bb9b7..745676e209d3ff44dc828507e43ca8c09f023e9c 100644 (file)
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -356,7 +356,7 @@ void rcu_exit(void)
         */
 }
 
-DEFINE_RCU_FLAVOR()
+DEFINE_RCU_FLAVOR(rcu_flavor);
 
 #include "urcu-call-rcu-impl.h"
 #include "urcu-defer-impl.h"

diff --git a/urcu.c b/urcu.c
index b4346551b2403127da9822f08223f875c991e4ca..39486296c19036561d7862748274223513172545 100644 (file)
--- a/urcu.c
+++ b/urcu.c
@@ -452,7 +452,7 @@ void rcu_exit(void)
 
 #endif /* #ifdef RCU_SIGNAL */
 
-DEFINE_RCU_FLAVOR()
+DEFINE_RCU_FLAVOR(rcu_flavor);
 
 #include "urcu-call-rcu-impl.h"
 #include "urcu-defer-impl.h"