The following commit has been merged into the core/rcu branch of tip: Commit-ID: 67d64918a163fd62cf3b668d69133b723c48ed96 Gitweb: https://git.kernel.org/tip/67d64918a163fd62cf3b668d69133b723c48ed96 Author: Wolfgang M. Reimer <linuxball@xxxxxxxxx> AuthorDate: Mon, 16 Sep 2019 16:54:04 +02:00 Committer: Paul E. McKenney <paulmck@xxxxxxxxxx> CommitterDate: Sat, 05 Oct 2019 11:50:24 -07:00 locking: locktorture: Do not include rwlock.h directly Including rwlock.h directly will cause kernel builds to fail if CONFIG_PREEMPT_RT is defined. The correct header file (rwlock_rt.h OR rwlock.h) will be included by spinlock.h which is included by locktorture.c anyway. Remove the include of linux/rwlock.h. Signed-off-by: Wolfgang M. Reimer <linuxball@xxxxxxxxx> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> Acked-by: Davidlohr Bueso <dbueso@xxxxxxx> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> --- kernel/locking/locktorture.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 8dd9002..99475a6 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -16,7 +16,6 @@ #include <linux/kthread.h> #include <linux/sched/rt.h> #include <linux/spinlock.h> -#include <linux/rwlock.h> #include <linux/mutex.h> #include <linux/rwsem.h> #include <linux/smp.h>
|