From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 14 Jun 2013 21:31:17 +0000 (-0400)
Subject: Merge branch 'master' into urcu/rcuja-range
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=02c3d91e578d156910027060ac720b1192e7ddc2;hp=-c;p=userspace-rcu.git

Merge branch 'master' into urcu/rcuja-range

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

02c3d91e578d156910027060ac720b1192e7ddc2
diff --combined urcu/rculfhash.h
index 9c38212,afd0c3e..4c400ce
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@@ -177,7 -177,8 +177,8 @@@ struct cds_lfht *cds_lfht_new(unsigned 
   * Return 0 on success, negative error value on error.
   * Threads calling this API need to be registered RCU read-side threads.
   * cds_lfht_destroy should *not* be called from a RCU read-side critical
-  * section.
+  * section. It should *not* be called from a call_rcu thread context
+  * neither.
   */
  extern
  int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr);
@@@ -484,11 -485,6 +485,11 @@@ void cds_lfht_resize(struct cds_lfht *h
  			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
  					__typeof__(*(pos)), member))
  
 +/*
 + * cds_lfht_rcu_flavor: get RCU flavor argument from hash table creation.
 + */
 +const struct rcu_flavor_struct *cds_lfht_rcu_flavor(struct cds_lfht *ht);
 +
  #ifdef __cplusplus
  }
  #endif