From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 25 Apr 2019 08:08:37 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v3.18.139~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdb2e4dfc47c41653a5534d714e201985bcf5d8f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

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

diff --git a/queue-4.14/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch b/queue-4.14/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch
new file mode 100644
index 00000000000..e297ca43c00
--- /dev/null
+++ b/queue-4.14/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 4a195a0bc2e954b91085d5c82eb20c51835ee7b0 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
+@@ -3650,9 +3650,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.14/series b/queue-4.14/series
index b990527e888..e5926b36e7a 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -68,3 +68,4 @@ iomap-report-collisions-between-directio-and-buffered-writes-to-userspace.patch
 xfs-add-the-ability-to-join-a-held-buffer-to-a-defer_ops.patch
 xfs-hold-xfs_buf-locked-between-shortform-leaf-conversion-and-the-addition-of-an-attribute.patch
 i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch
+revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch