Merge remote branch 'origin/urcu/ht' into urcu/ht

[urcu.git] / urcu / rculist.h

diff --git a/urcu/rculist.h b/urcu/rculist.h
index b0c4f1a9d1e4430b538d737bc69246b2e789ce65..621831ce0aec6d3bd8117faa1aeed3b76bb64e16 100644 (file)
--- a/urcu/rculist.h
+++ b/urcu/rculist.h
@@ -30,18 +30,18 @@
 
 /* Add new element at the head of the list.
  */
-static inline void list_add_rcu(list_t *newp, list_t *head)
+static inline void cds_list_add_rcu(struct cds_list_head *newp, struct cds_list_head *head)
 {
        newp->next = head->next;
        newp->prev = head;
-       smp_wmb();
+       cmm_smp_wmb();
        head->next->prev = newp;
        head->next = newp;
 }
 
 /* replace an old entry atomically.
  */
-static inline void list_replace_rcu(list_t *old, list_t *_new)
+static inline void cds_list_replace_rcu(struct cds_list_head *old, struct cds_list_head *_new)
 {
        _new->next = old->next;
        _new->prev = old->prev;
@@ -50,7 +50,7 @@ static inline void list_replace_rcu(list_t *old, list_t *_new)
 }
 
 /* Remove element from list. */
-static inline void list_del_rcu(list_t *elem)
+static inline void cds_list_del_rcu(struct cds_list_head *elem)
 {
        elem->next->prev = elem->prev;
        elem->prev->next = elem->next;
@@ -62,16 +62,16 @@ static inline void list_del_rcu(list_t *elem)
  */
 
 /* Iterate forward over the elements of the list.  */
-#define list_for_each_rcu(pos, head) \
+#define cds_list_for_each_rcu(pos, head) \
   for (pos = rcu_dereference((head)->next); pos != (head); \
        pos = rcu_dereference(pos->next))
 
 
 /* Iterate through elements of the list.
  */
-#define list_for_each_entry_rcu(pos, head, member)                             \
-       for (pos = list_entry(rcu_dereference((head)->next), typeof(*pos), member);     \
+#define cds_list_for_each_entry_rcu(pos, head, member)                         \
+       for (pos = cds_list_entry(rcu_dereference((head)->next), typeof(*pos), member); \
             &pos->member != (head);                                    \
-            pos = list_entry(rcu_dereference(pos->member.next), typeof(*pos), member))
+            pos = cds_list_entry(rcu_dereference(pos->member.next), typeof(*pos), member))
 
 #endif /* _URCU_RCULIST_H */