4.9-stable patches

added patches:
	revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch

diff --git a/queue-4.9/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch b/queue-4.9/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch
new file mode 100644 (file)
index 0000000..0a8aa95
--- /dev/null
+++ b/queue-4.9/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch
@@ -0,0 +1,42 @@
+From 7f437eec35a20f40d9ff82ae1c072b211c29e8e0 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 25 Apr 2019 10:00:43 +0200
+Subject: Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 670d934a1ea178d7543e6f50b515c76cebeb2fcf which was
+commit 71492580571467fb7177aade19c18ce7486267f5 upstream.
+
+Tetsuo rightly points out that the backport here is incorrect, as it
+touches the __lock_set_class function instead of the intended
+__lock_downgrade function.
+
+Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
+Cc: Waiman Long <longman@redhat.com>
+Cc: 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>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/locking/lockdep.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/kernel/locking/lockdep.c
++++ b/kernel/locking/lockdep.c
+@@ -3446,9 +3446,6 @@ __lock_set_class(struct lockdep_map *loc
+       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,

diff --git a/queue-4.9/series b/queue-4.9/series
index 8afa62d34428d161f46f88649cfe55007fd91a20..506b7b54e2d7defa245a41e7ba66c49a551a2a99 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -42,3 +42,4 @@ mm-vmstat.c-fix-proc-vmstat-format-for-config_debug_tlbflush-y-config_smp-n.patc
 alsa-info-fix-racy-addition-deletion-of-nodes.patch
 percpu-stop-printing-kernel-addresses.patch
 i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch
+revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch