mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 12:59:03 +02:00
886d2063cd
Backport patches from upstream to fix build errors when building with kernel v5.1. These patches are backported from stable branch. The code v5.1 is protected by ifdefs so v4.19 works as well. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 68f073a5cdd89f905cb39895f5c2f160a6585672 Mon Sep 17 00:00:00 2001
|
|
From: Michael Jeanson <mjeanson@efficios.com>
|
|
Date: Mon, 18 Mar 2019 16:20:33 -0400
|
|
Subject: [PATCH 2/5] 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.
|
|
|
|
Upstream-Status: Backport [http://git.lttng.org/?p=lttng-modules.git;a=commit;h=92da05ce1f73488a57e7fd79e9c03113cefdb76f]
|
|
|
|
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
|
---
|
|
lttng-events.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/lttng-events.c b/lttng-events.c
|
|
index 47431ca..3481bd4 100644
|
|
--- a/lttng-events.c
|
|
+++ b/lttng-events.c
|
|
@@ -89,7 +89,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();
|
|
--
|
|
2.17.0
|
|
|