Merge branch 'master' into urcu/ht-shrink
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 5 Dec 2011 23:37:50 +0000 (18:37 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 5 Dec 2011 23:37:50 +0000 (18:37 -0500)
Conflicts:
Makefile.am
urcu-bp.c

1  2 
Makefile.am
urcu-bp.c
urcu-bp.h

diff --cc Makefile.am
index 91a9fd144645dea22a9ac609e22bdb9a19112042,a7d3316cf144f946546098e866c9ab824058888d..e1bf095458db0cd891dbaef174b158be07743156
@@@ -22,8 -21,8 +22,9 @@@ EXTRA_DIST = $(top_srcdir)/urcu/arch/*.
                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 API.txt
 +              rculfhash-internal.h \
+               ChangeLog API.txt \
+               $(top_srcdir)/tests/*.sh
  
  if COMPAT_ARCH
  COMPAT=compat_arch_@ARCHTYPE@.c
diff --cc urcu-bp.c
index 3b2062d6590034ad33619ab1372b137237a9fd1e,f3249b43b313decebc29e193b5c82ebf1114a735..912e9b2ea31ad7c42d46a8f9d31f88f6d46a4361
+++ b/urcu-bp.c
@@@ -421,7 -421,28 +421,30 @@@ void rcu_bp_after_fork_child(void
        assert(!ret);
  }
  
+ void *rcu_dereference_sym_bp(void *p)
+ {
+       return _rcu_dereference(p);
+ }
+ void *rcu_set_pointer_sym_bp(void **p, void *v)
+ {
+       cmm_wmb();
+       return uatomic_set(p, v);
+ }
+ void *rcu_xchg_pointer_sym_bp(void **p, void *v)
+ {
+       cmm_wmb();
+       return uatomic_xchg(p, v);
+ }
+ void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new)
+ {
+       cmm_wmb();
+       return uatomic_cmpxchg(p, old, _new);
+ }
 +DEFINE_RCU_FLAVOR()
 +
  #include "urcu-call-rcu-impl.h"
  #include "urcu-defer-impl.h"
diff --cc urcu-bp.h
Simple merge
This page took 0.036181 seconds and 4 git commands to generate.