45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
|
From 7ae2b72f322e9edceac43a2052d518033daa916d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
Date: Mon, 9 Jul 2018 11:58:08 +0200
|
||
|
|
Subject: [PATCH 348/365] rcu: Do not include rtmutex_common.h unconditionally
|
||
|
|
|
||
|
|
[ upstream commit b88697810d7c1d102a529990f9071b0f14cfe6df ]
|
||
|
|
|
||
|
|
This commit adjusts include files and provides definitions in preparation
|
||
|
|
for suppressing lockdep false-positive ->boost_mtx complaints. Without
|
||
|
|
this preparation, architectures not supporting rt_mutex will get build
|
||
|
|
failures.
|
||
|
|
|
||
|
|
Reported-by: kbuild test robot <fengguang.wu@intel.com>
|
||
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
|
||
|
|
Signed-off-by: Julia Cartwright <julia@ni.com>
|
||
|
|
---
|
||
|
|
kernel/rcu/tree_plugin.h | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
|
||
|
|
index a1a7bafcce15..3d18d08e8382 100644
|
||
|
|
--- a/kernel/rcu/tree_plugin.h
|
||
|
|
+++ b/kernel/rcu/tree_plugin.h
|
||
|
|
@@ -37,6 +37,7 @@
|
||
|
|
* This probably needs to be excluded from -rt builds.
|
||
|
|
*/
|
||
|
|
#define rt_mutex_owner(a) ({ WARN_ON_ONCE(1); NULL; })
|
||
|
|
+#define rt_mutex_futex_unlock(x) WARN_ON_ONCE(1)
|
||
|
|
|
||
|
|
#endif /* #else #ifdef CONFIG_RCU_BOOST */
|
||
|
|
|
||
|
|
@@ -834,8 +835,6 @@ static void rcu_cpu_kthread_setup(unsigned int cpu)
|
||
|
|
|
||
|
|
#ifdef CONFIG_RCU_BOOST
|
||
|
|
|
||
|
|
-#include "../locking/rtmutex_common.h"
|
||
|
|
-
|
||
|
|
#ifdef CONFIG_RCU_TRACE
|
||
|
|
|
||
|
|
static void rcu_initiate_boost_trace(struct rcu_node *rnp)
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|