remove queue-3.14/clk-really-fix-deadlock-with-mmap_sem.patch from 3.14 queue

diff --git a/queue-3.14/clk-don-t-try-to-use-a-struct-clk-after-it-could-have-been-freed.patch b/queue-3.14/clk-don-t-try-to-use-a-struct-clk-after-it-could-have-been-freed.patch
index bb194bcb1779273cc24ce3ce16a9d61c28d1ebaa..e03847cf2c3528a37802448cfde30780f236761c 100644 (file)
--- a/queue-3.14/clk-don-t-try-to-use-a-struct-clk-after-it-could-have-been-freed.patch
+++ b/queue-3.14/clk-don-t-try-to-use-a-struct-clk-after-it-could-have-been-freed.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -2233,14 +2233,17 @@ int __clk_get(struct clk *clk)
+@@ -2232,14 +2232,17 @@ int __clk_get(struct clk *clk)
  
  void __clk_put(struct clk *clk)
  {

diff --git a/queue-3.14/clk-really-fix-deadlock-with-mmap_sem.patch b/queue-3.14/clk-really-fix-deadlock-with-mmap_sem.patch
deleted file mode 100644 (file)
index 1036d3e..0000000
--- a/queue-3.14/clk-really-fix-deadlock-with-mmap_sem.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 89f7e9de59bf3e3cda2e00de12c66db22675a7cf Mon Sep 17 00:00:00 2001
-From: Stephen Boyd <sboyd@codeaurora.org>
-Date: Fri, 12 Dec 2014 15:04:16 -0800
-Subject: clk: Really fix deadlock with mmap_sem
-
-From: Stephen Boyd <sboyd@codeaurora.org>
-
-commit 89f7e9de59bf3e3cda2e00de12c66db22675a7cf upstream.
-
-Commit 6314b6796e3c (clk: Don't hold prepare_lock across debugfs
-creation, 2014-09-04) forgot to update one place where we hold
-the prepare_lock while creating debugfs directories. This means
-we still have the chance of a deadlock that the commit was trying
-to fix. Actually fix it by moving the debugfs creation outside
-the prepare_lock.
-
-Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Fixes: 6314b6796e3c "clk: Don't hold prepare_lock across debugfs creation"
-Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: Michael Turquette <mturquette@linaro.org>
-[mturquette@linaro.org: removed lockdep_assert]
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/clk/clk.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/clk/clk.c
-+++ b/drivers/clk/clk.c
-@@ -230,7 +230,6 @@ static const struct file_operations clk_
-       .release        = single_release,
- };
- 
--/* caller must hold prepare_lock */
- static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry)
- {
-       struct dentry *d;
-@@ -1902,7 +1901,6 @@ int __clk_init(struct device *dev, struc
-       else
-               clk->rate = 0;
- 
--      clk_debug_register(clk);
-       /*
-        * walk the list of orphan clocks and reparent any that are children of
-        * this clock
-@@ -1937,6 +1935,9 @@ int __clk_init(struct device *dev, struc
- out:
-       clk_prepare_unlock();
- 
-+      if (!ret)
-+              clk_debug_register(clk);
-+
-       return ret;
- }
- 

diff --git a/queue-3.14/series b/queue-3.14/series
index d4d1be3381f015a64ae34884b94aff4a184ec4d0..517cf11f82f6e7bfa1054d8671db914b8e06f37b 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -37,7 +37,6 @@ revert-mpt2sas-remove-phys-on-topology-change.patch
 revert-mpt3sas-remove-phys-on-topology-change.patch
 scsi-blacklist-rsoc-for-microsoft-iscsi-target-devices.patch
 clk-samsung-fix-double-add-of-syscore-ops-after-driver-rebind.patch
-clk-really-fix-deadlock-with-mmap_sem.patch
 clk-don-t-try-to-use-a-struct-clk-after-it-could-have-been-freed.patch
 parisc-fix-out-of-register-compiler-error-in-ldcw-inline-assembler-function.patch
 storvsc-ring-buffer-failures-may-result-in-i-o-freeze.patch