X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=ee936ff507338cf2e9bbda0cd6a397087e4ac871;hb=86adb855ec08ae28bc29ee5dac70b759b4022816;hp=a754048cc51ccc624a028c522aa8a030fbf04fcf;hpb=6423c3134bf07d4a7db56f69f2c79b540a79c4f1;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index a754048c..ee936ff5 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -13,6 +13,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <urcu/compiler.h>
@@ -23,7 +31,7 @@
 
 #define tp_rcu_read_lock_bp	rcu_read_lock_bp
 #define tp_rcu_read_unlock_bp	rcu_read_unlock_bp
-#define tp_rcu_dereference_bp	rcu_dereference_bp
+#define tp_rcu_dereference_bp	rcu_dereference
 #define TP_RCU_LINK_TEST()	1
 
 #else	/* _LGPL_SOURCE */
@@ -31,12 +39,9 @@
 #define tp_rcu_read_lock_bp	tracepoint_dlopen.rcu_read_lock_sym_bp
 #define tp_rcu_read_unlock_bp	tracepoint_dlopen.rcu_read_unlock_sym_bp
 
-#define tp_rcu_dereference_bp(p)					     \
-	({								     \
-		__typeof__(p) _________p1 = URCU_FORCE_CAST(__typeof__(p),   \
-			tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
-		(_________p1);						     \
-	})
+#define tp_rcu_dereference_bp(p)					   \
+		URCU_FORCE_CAST(__typeof__(p),				   \
+			tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p)))
 
 #define TP_RCU_LINK_TEST()	tp_rcu_read_lock_bp