delete broken 3.0 ib patch

diff --git a/queue-3.0/ib-core-fix-mismatch-between-locked-and-pinned-pages.patch b/queue-3.0/ib-core-fix-mismatch-between-locked-and-pinned-pages.patch
deleted file mode 100644 (file)
index 157ef2d..0000000
--- a/queue-3.0/ib-core-fix-mismatch-between-locked-and-pinned-pages.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c4870eb874ac16dccef40e1bc7a002c7e9156adc Mon Sep 17 00:00:00 2001
-From: Yishai Hadas <yishaih@mellanox.com>
-Date: Thu, 10 May 2012 23:28:05 +0300
-Subject: IB/core: Fix mismatch between locked and pinned pages
-
-From: Yishai Hadas <yishaih@mellanox.com>
-
-commit c4870eb874ac16dccef40e1bc7a002c7e9156adc upstream.
-
-Commit bc3e53f682d9 ("mm: distinguish between mlocked and pinned
-pages") introduced a separate counter for pinned pages and used it in
-the IB stack.  However, in ib_umem_get() the pinned counter is
-incremented, but ib_umem_release() wrongly decrements the locked
-counter.  Fix this.
-
-Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
-Reviewed-by: Christoph Lameter <cl@linux.com>
-Signed-off-by: Roland Dreier <roland@purestorage.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/infiniband/core/umem.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/core/umem.c
-+++ b/drivers/infiniband/core/umem.c
-@@ -268,7 +268,7 @@ void ib_umem_release(struct ib_umem *ume
-       } else
-               down_write(&mm->mmap_sem);
- 
--      current->mm->locked_vm -= diff;
-+      current->mm->pinned_vm -= diff;
-       up_write(&mm->mmap_sem);
-       mmput(mm);
-       kfree(umem);

diff --git a/queue-3.0/series b/queue-3.0/series
index 6cd6afb137df6e70c59e8edabd585f2def40e5ef..6b4e61a28a4bd0e436499ba94a4806e143ecc11b 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -13,7 +13,6 @@ scsi-mpt2sas-fix-for-panic-happening-because-of-improper-memory-allocation.patch
 rdma-cxgb4-drop-peer_abort-when-no-endpoint-found.patch
 keys-use-the-compat-keyctl-syscall-wrapper-on-sparc64-for-sparc32-compat.patch
 selinux-if-sel_make_bools-errors-don-t-leave-inconsistent-state.patch
-ib-core-fix-mismatch-between-locked-and-pinned-pages.patch
 drivers-staging-comedi-comedi_fops.c-add-missing-vfree.patch
 perf-x86-update-event-scheduling-constraints-for-amd-family-15h-models.patch
 mtd-sm_ftl-fix-typo-in-major-number.patch