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

4.4-stable patches

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

diff --git a/queue-4.4/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch b/queue-4.4/revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch
new file mode 100644
index 00000000000..245097df19b
--- /dev/null
+++ b/queue-4.4/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 4aada79c6793c59e484b69fd4ed591396e2d4b39 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
+@@ -3314,9 +3314,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.4/series b/queue-4.4/series
index 9107869a550..7504eb18841 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -166,3 +166,4 @@ sched-fair-limit-sched_cfs_period_timer-loop-to-avoi.patch
 device_cgroup-fix-rcu-imbalance-in-error-case.patch
 mm-vmstat.c-fix-proc-vmstat-format-for-config_debug_tlbflush-y-config_smp-n.patch
 alsa-info-fix-racy-addition-deletion-of-nodes.patch
+revert-locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch