drop 3.18.y lockdep patch as it is incorrect.

diff --git a/queue-3.18/locking-lockdep-add-debug_locks-check-in-__lock_down.patch b/queue-3.18/locking-lockdep-add-debug_locks-check-in-__lock_down.patch
deleted file mode 100644 (file)
index e864ea1..0000000
--- a/queue-3.18/locking-lockdep-add-debug_locks-check-in-__lock_down.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b657782c668303713770ef97587a10335ae4aa76 Mon Sep 17 00:00:00 2001
-From: Waiman Long <longman@redhat.com>
-Date: Wed, 9 Jan 2019 23:03:25 -0500
-Subject: locking/lockdep: Add debug_locks check in __lock_downgrade()
-
-[ Upstream commit 71492580571467fb7177aade19c18ce7486267f5 ]
-
-Tetsuo Handa had reported he saw an incorrect "downgrading a read lock"
-warning right after a previous lockdep warning. It is likely that the
-previous warning turned off lock debugging causing the lockdep to have
-inconsistency states leading to the lock downgrade warning.
-
-Fix that by add a check for debug_locks at the beginning of
-__lock_downgrade().
-
-Debugged-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
-Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
-Reported-by: syzbot+53383ae265fb161ef488@syzkaller.appspotmail.com
-Signed-off-by: Waiman Long <longman@redhat.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Will Deacon <will.deacon@arm.com>
-Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/locking/lockdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index fb90ca3a296e..27de98428367 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -3312,6 +3312,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
-       unsigned int depth;
-       int i;
- 
-+      if (unlikely(!debug_locks))
-+              return 0;
-+
-       depth = curr->lockdep_depth;
-       /*
-        * This function is about (re)setting the class of a held lock,
--- 
-2.19.1
-

diff --git a/queue-3.18/series b/queue-3.18/series
index 898cd22a1a63b20bf322cf4c8b75cb0cbb0e0e71..84d20caef1f71d984ab3a6c1f2c9182738f263ad 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -28,7 +28,6 @@ bcache-improve-sysfs_strtoul_clamp.patch
 fbdev-fbmem-fix-memory-access-if-logo-is-bigger-than.patch
 cdrom-fix-race-condition-in-cdrom_sysctl_register.patch
 e1000e-fix-cyclic-resets-at-link-up-with-active-tx.patch
-locking-lockdep-add-debug_locks-check-in-__lock_down.patch
 tty-increase-the-default-flip-buffer-limit-to-2-640k.patch
 media-mt9m111-set-initial-frame-size-other-than-0x0.patch
 hwrng-virtio-avoid-repeated-init-of-completion.patch