Merge branch 'urcu/ht-shrink'

diff --combined Makefile.am
index caf5cd61111867e3269eb85ae33c17736d1fd70c,3cfa0ef66ff1b7de98c2ebcafce354aee6d2ba3b..a24cf60671e258e7bc62b5366f1cc554fb119979
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -10,19 -10,21 +10,21 @@@ AM_CFLAGS=-Wal
  SUBDIRS = . tests
  
  include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
-               urcu-pointer.h urcu-qsbr.h
+               urcu-pointer.h urcu-qsbr.h urcu-flavor.h
  nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
                urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/futex.h \
                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 \
+               rculfhash-internal.h \
                ChangeLog API.txt \
                $(top_srcdir)/tests/*.sh
  
@@@ -36,6 -38,9 +38,9 @@@ if COMPAT_FUTE
  COMPAT+=compat_futex.c
  endif
  
+ RCULFHASH = rculfhash.c rculfhash-mm-order.c rculfhash-mm-chunk.c \
+               rculfhash-mm-mmap.c
+ 
  lib_LTLIBRARIES = liburcu-common.la \
                liburcu.la liburcu-qsbr.la \
                liburcu-mb.la liburcu-signal.la liburcu-bp.la \
@@@ -64,11 -69,9 +69,11 @@@ 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) $(COMPAT)
  liburcu_cds_la_LIBADD = liburcu-common.la
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
        liburcu-signal.pc liburcu-mb.pc
 +
 +dist_doc_DATA = README ChangeLog