From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 2 Oct 2011 16:56:36 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~102
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=f96d597f3a04010d432c36b9bb07e910720000ab;hp=-c;p=userspace-rcu.git

Merge branch 'master' into urcu/ht-shrink

Conflicts:
	urcu-call-rcu.h

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

f96d597f3a04010d432c36b9bb07e910720000ab
diff --combined Makefile.am
index ff7f1bb,30c700b..4e4ce89
--- a/Makefile.am
+++ b/Makefile.am
@@@ -14,15 -14,14 +14,15 @@@ nobase_dist_include_HEADERS = urcu/comp
  		urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \
  		urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \
  		urcu/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.h \
 -		urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h
 +		urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h \
 +		urcu/rculfhash.h
  nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
  
  EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \
  		gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \
  		README LICENSE compat_arch_x86.c \
  		urcu-call-rcu-impl.h urcu-defer-impl.h \
- 		ChangeLog
+ 		ChangeLog API.txt
  
  if COMPAT_ARCH
  COMPAT=compat_arch_@ARCHTYPE@.c
@@@ -62,7 -61,7 +62,7 @@@ liburcu_signal_la_LIBADD = liburcu-comm
  liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
  liburcu_bp_la_LIBADD = liburcu-common.la
  
 -liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
 +liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c rculfhash.c $(COMPAT)
  liburcu_cds_la_LIBADD = liburcu-common.la
  
  pkgconfigdir = $(libdir)/pkgconfig