From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 18 Mar 2019 20:20:33 +0000 (-0400)
Subject: Fix: rcu: Remove wrapper definitions for obsolete RCU... (v5.1)
X-Git-Tag: v2.11.0-rc5~22
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=f4a8ec4d6b5d2515987f4d2d37dfeb8d116d3fff

Fix: rcu: Remove wrapper definitions for obsolete RCU... (v5.1)

See upstream commit :

commit 6ba7d681aca22e53385bdb35b1d7662e61905760
Author: Paul E. McKenney <paulmck@linux.ibm.com>
Date:   Wed Jan 9 15:22:03 2019 -0800

    rcu: Remove wrapper definitions for obsolete RCU update functions

    None of synchronize_rcu_bh, synchronize_rcu_bh_expedited, call_rcu_bh,
    rcu_barrier_bh, synchronize_sched, synchronize_sched_expedited,
    call_rcu_sched, rcu_barrier_sched, get_state_synchronize_sched, and
    cond_synchronize_sched are actually used.  This commit therefore removes
    their trivial wrapper-function definitions.

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

diff --git a/lttng-events.c b/lttng-events.c
index 3964df5f..742bec4d 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -76,7 +76,12 @@ int _lttng_field_statedump(struct lttng_session *session,
 
 void synchronize_trace(void)
 {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
+	synchronize_rcu();
+#else
 	synchronize_sched();
+#endif
+
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 #ifdef CONFIG_PREEMPT_RT_FULL
 	synchronize_rcu();