]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch from everywhere
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Mar 2020 18:28:34 +0000 (19:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Mar 2020 18:28:34 +0000 (19:28 +0100)
12 files changed:
queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch [deleted file]
queue-4.14/series
queue-4.19/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch [deleted file]
queue-4.19/series
queue-4.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch [deleted file]
queue-4.4/series
queue-4.9/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch [deleted file]
queue-4.9/series
queue-5.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch [deleted file]
queue-5.4/series
queue-5.5/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch [deleted file]
queue-5.5/series

diff --git a/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
deleted file mode 100644 (file)
index 61ca4f4..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-Date: Tue, 3 Dec 2019 14:31:11 -0500
-Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
-
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-
-commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
-
-lockdep complains when padata's paths to update cpumasks via CPU hotplug
-and sysfs are both taken:
-
-  # echo 0 > /sys/devices/system/cpu/cpu1/online
-  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
-
-  ======================================================
-  WARNING: possible circular locking dependency detected
-  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
-  ------------------------------------------------------
-  bash/205 is trying to acquire lock:
-  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
-
-  but task is already holding lock:
-  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
-
-  which lock already depends on the new lock.
-
-padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
-order.  Which should be first?  CPU hotplug calls into padata with
-cpu_hotplug_lock already held, so it should have priority.
-
-Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
-Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: linux-crypto@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/padata.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -605,8 +605,8 @@ int padata_set_cpumask(struct padata_ins
-       struct cpumask *serial_mask, *parallel_mask;
-       int err = -EINVAL;
--      mutex_lock(&pinst->lock);
-       get_online_cpus();
-+      mutex_lock(&pinst->lock);
-       switch (cpumask_type) {
-       case PADATA_CPU_PARALLEL:
-@@ -624,8 +624,8 @@ int padata_set_cpumask(struct padata_ins
-       err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
- out:
--      put_online_cpus();
-       mutex_unlock(&pinst->lock);
-+      put_online_cpus();
-       return err;
- }
index 22165d51ee3154430da905bc38edd0ab66e01224..a233d474c94d5517f3def84379d8dba7f0969cba 100644 (file)
@@ -61,6 +61,5 @@ tuntap-correctly-set-sockwq_async_nospace.patch
 drivers-net-xgene-fix-the-order-of-the-arguments-of-alloc_etherdev_mqs.patch
 kprobes-set-unoptimized-flag-after-unoptimizing-code.patch
 perf-hists-browser-restore-esc-as-zoom-out-of-dso-thread-etc.patch
-padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
 mm-huge_memory.c-use-head-to-check-huge-zero-page.patch
 mm-thp-fix-defrag-setting-if-newline-is-not-used.patch
diff --git a/queue-4.19/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-4.19/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
deleted file mode 100644 (file)
index dd26d4d..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-Date: Tue, 3 Dec 2019 14:31:11 -0500
-Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
-
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-
-commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
-
-lockdep complains when padata's paths to update cpumasks via CPU hotplug
-and sysfs are both taken:
-
-  # echo 0 > /sys/devices/system/cpu/cpu1/online
-  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
-
-  ======================================================
-  WARNING: possible circular locking dependency detected
-  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
-  ------------------------------------------------------
-  bash/205 is trying to acquire lock:
-  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
-
-  but task is already holding lock:
-  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
-
-  which lock already depends on the new lock.
-
-padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
-order.  Which should be first?  CPU hotplug calls into padata with
-cpu_hotplug_lock already held, so it should have priority.
-
-Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
-Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: linux-crypto@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/padata.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -671,8 +671,8 @@ int padata_set_cpumask(struct padata_ins
-       struct cpumask *serial_mask, *parallel_mask;
-       int err = -EINVAL;
--      mutex_lock(&pinst->lock);
-       get_online_cpus();
-+      mutex_lock(&pinst->lock);
-       switch (cpumask_type) {
-       case PADATA_CPU_PARALLEL:
-@@ -690,8 +690,8 @@ int padata_set_cpumask(struct padata_ins
-       err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
- out:
--      put_online_cpus();
-       mutex_unlock(&pinst->lock);
-+      put_online_cpus();
-       return err;
- }
index 8da2c40c4e3150466a4e7fdbb4c4d99560379e13..d17668ae0c34765ede7900b85b88b65285c65692 100644 (file)
@@ -81,6 +81,5 @@ kvm-x86-remove-spurious-clearing-of-async-pf-msr.patch
 thermal-brcmstb_thermal-do-not-use-dt-coefficients.patch
 netfilter-nft_tunnel-no-need-to-call-htons-when-dumping-ports.patch
 netfilter-nf_flowtable-fix-documentation.patch
-padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
 mm-huge_memory.c-use-head-to-check-huge-zero-page.patch
 mm-thp-fix-defrag-setting-if-newline-is-not-used.patch
diff --git a/queue-4.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-4.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
deleted file mode 100644 (file)
index c66528f..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-Date: Tue, 3 Dec 2019 14:31:11 -0500
-Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
-
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-
-commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
-
-lockdep complains when padata's paths to update cpumasks via CPU hotplug
-and sysfs are both taken:
-
-  # echo 0 > /sys/devices/system/cpu/cpu1/online
-  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
-
-  ======================================================
-  WARNING: possible circular locking dependency detected
-  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
-  ------------------------------------------------------
-  bash/205 is trying to acquire lock:
-  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
-
-  but task is already holding lock:
-  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
-
-  which lock already depends on the new lock.
-
-padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
-order.  Which should be first?  CPU hotplug calls into padata with
-cpu_hotplug_lock already held, so it should have priority.
-
-Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
-Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: linux-crypto@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/padata.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -640,8 +640,8 @@ int padata_set_cpumask(struct padata_ins
-       struct cpumask *serial_mask, *parallel_mask;
-       int err = -EINVAL;
--      mutex_lock(&pinst->lock);
-       get_online_cpus();
-+      mutex_lock(&pinst->lock);
-       switch (cpumask_type) {
-       case PADATA_CPU_PARALLEL:
-@@ -659,8 +659,8 @@ int padata_set_cpumask(struct padata_ins
-       err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
- out:
--      put_online_cpus();
-       mutex_unlock(&pinst->lock);
-+      put_online_cpus();
-       return err;
- }
index 99d230b1cb1e5bbda4376132854f7866d4b9e8f3..bf0c18fb2eb2a54ab501e0c0b11cb543bbd469cd 100644 (file)
@@ -37,4 +37,3 @@ mm-gup-ensure-real-head-page-is-ref-counted-when-using-hugepages.patch
 mm-prevent-get_user_pages-from-overflowing-page-refcount.patch
 pipe-add-pipe_buf_get-helper.patch
 fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
-padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
diff --git a/queue-4.9/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-4.9/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
deleted file mode 100644 (file)
index e09bd23..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-Date: Tue, 3 Dec 2019 14:31:11 -0500
-Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
-
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-
-commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
-
-lockdep complains when padata's paths to update cpumasks via CPU hotplug
-and sysfs are both taken:
-
-  # echo 0 > /sys/devices/system/cpu/cpu1/online
-  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
-
-  ======================================================
-  WARNING: possible circular locking dependency detected
-  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
-  ------------------------------------------------------
-  bash/205 is trying to acquire lock:
-  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
-
-  but task is already holding lock:
-  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
-
-  which lock already depends on the new lock.
-
-padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
-order.  Which should be first?  CPU hotplug calls into padata with
-cpu_hotplug_lock already held, so it should have priority.
-
-Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
-Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: linux-crypto@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/padata.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -614,8 +614,8 @@ int padata_set_cpumask(struct padata_ins
-       struct cpumask *serial_mask, *parallel_mask;
-       int err = -EINVAL;
--      mutex_lock(&pinst->lock);
-       get_online_cpus();
-+      mutex_lock(&pinst->lock);
-       switch (cpumask_type) {
-       case PADATA_CPU_PARALLEL:
-@@ -633,8 +633,8 @@ int padata_set_cpumask(struct padata_ins
-       err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
- out:
--      put_online_cpus();
-       mutex_unlock(&pinst->lock);
-+      put_online_cpus();
-       return err;
- }
index b1310e9e94a9ab866ba6c774b7e8ed290d045f38..887ae4d9ccf0efdd1382ba3c245d67b307675bbf 100644 (file)
@@ -46,5 +46,4 @@ slip-stop-double-free-sl-dev-in-slip_open.patch
 tuntap-correctly-set-sockwq_async_nospace.patch
 drivers-net-xgene-fix-the-order-of-the-arguments-of-alloc_etherdev_mqs.patch
 perf-hists-browser-restore-esc-as-zoom-out-of-dso-thread-etc.patch
-padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
 mm-huge_memory.c-use-head-to-check-huge-zero-page.patch
diff --git a/queue-5.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-5.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
deleted file mode 100644 (file)
index 7b71e9b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-Date: Tue, 3 Dec 2019 14:31:11 -0500
-Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
-
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-
-commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
-
-lockdep complains when padata's paths to update cpumasks via CPU hotplug
-and sysfs are both taken:
-
-  # echo 0 > /sys/devices/system/cpu/cpu1/online
-  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
-
-  ======================================================
-  WARNING: possible circular locking dependency detected
-  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
-  ------------------------------------------------------
-  bash/205 is trying to acquire lock:
-  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
-
-  but task is already holding lock:
-  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
-
-  which lock already depends on the new lock.
-
-padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
-order.  Which should be first?  CPU hotplug calls into padata with
-cpu_hotplug_lock already held, so it should have priority.
-
-Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
-Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: linux-crypto@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/padata.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -643,8 +643,8 @@ int padata_set_cpumask(struct padata_ins
-       struct cpumask *serial_mask, *parallel_mask;
-       int err = -EINVAL;
--      mutex_lock(&pinst->lock);
-       get_online_cpus();
-+      mutex_lock(&pinst->lock);
-       switch (cpumask_type) {
-       case PADATA_CPU_PARALLEL:
-@@ -662,8 +662,8 @@ int padata_set_cpumask(struct padata_ins
-       err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
- out:
--      put_online_cpus();
-       mutex_unlock(&pinst->lock);
-+      put_online_cpus();
-       return err;
- }
index 56027c384ca7e88625adcfe0e17fd21b93238e0f..048dc22c271e01768a8d510edbbfe8c1877efeff 100644 (file)
@@ -141,7 +141,6 @@ netfilter-nft_tunnel-no-need-to-call-htons-when-dumping-ports.patch
 netfilter-nf_flowtable-fix-documentation.patch
 bus-tegra-aconnect-remove-pm_clk-dependency.patch
 xfs-clear-kernel-only-flags-in-xfs_ioc_attrmulti_by_handle.patch
-padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
 locking-lockdep-fix-lockdep_stats-indentation-problem.patch
 mm-debug.c-always-print-flags-in-dump_page.patch
 mm-gup-allow-foll_force-for-get_user_pages_fast.patch
diff --git a/queue-5.5/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-5.5/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
deleted file mode 100644 (file)
index 7b71e9b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-Date: Tue, 3 Dec 2019 14:31:11 -0500
-Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
-
-From: Daniel Jordan <daniel.m.jordan@oracle.com>
-
-commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
-
-lockdep complains when padata's paths to update cpumasks via CPU hotplug
-and sysfs are both taken:
-
-  # echo 0 > /sys/devices/system/cpu/cpu1/online
-  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
-
-  ======================================================
-  WARNING: possible circular locking dependency detected
-  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
-  ------------------------------------------------------
-  bash/205 is trying to acquire lock:
-  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
-
-  but task is already holding lock:
-  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
-
-  which lock already depends on the new lock.
-
-padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
-order.  Which should be first?  CPU hotplug calls into padata with
-cpu_hotplug_lock already held, so it should have priority.
-
-Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
-Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
-Cc: Eric Biggers <ebiggers@kernel.org>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: linux-crypto@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/padata.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -643,8 +643,8 @@ int padata_set_cpumask(struct padata_ins
-       struct cpumask *serial_mask, *parallel_mask;
-       int err = -EINVAL;
--      mutex_lock(&pinst->lock);
-       get_online_cpus();
-+      mutex_lock(&pinst->lock);
-       switch (cpumask_type) {
-       case PADATA_CPU_PARALLEL:
-@@ -662,8 +662,8 @@ int padata_set_cpumask(struct padata_ins
-       err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
- out:
--      put_online_cpus();
-       mutex_unlock(&pinst->lock);
-+      put_online_cpus();
-       return err;
- }
index d96f882d995befb68a4eb6ba7a582d7e852ed0a3..f4afc3e0e6143e52b7867976a55be053e59148c9 100644 (file)
@@ -165,7 +165,6 @@ netfilter-nf_flowtable-fix-documentation.patch
 bus-tegra-aconnect-remove-pm_clk-dependency.patch
 clk-qcom-rpmh-sort-of-match-table.patch
 xfs-clear-kernel-only-flags-in-xfs_ioc_attrmulti_by_handle.patch
-padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
 locking-lockdep-fix-lockdep_stats-indentation-problem.patch
 mm-debug.c-always-print-flags-in-dump_page.patch
 mm-gup-allow-foll_force-for-get_user_pages_fast.patch