]> git.openfabrics.org - ~emulex/compat-rdma_3.12.git/commitdiff
IB/qib: backport < 3.2 for pinned_vm field
authorMike Marciniszyn <mike.marciniszyn@intel.com>
Wed, 25 Jul 2012 16:08:06 +0000 (12:08 -0400)
committerMike Marciniszyn <mike.marciniszyn@intel.com>
Wed, 25 Jul 2012 16:08:06 +0000 (12:08 -0400)
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
patches/0010-qib-pinned-vm.patch [new file with mode: 0644]

diff --git a/patches/0010-qib-pinned-vm.patch b/patches/0010-qib-pinned-vm.patch
new file mode 100644 (file)
index 0000000..ef850c2
--- /dev/null
@@ -0,0 +1,32 @@
+IB/qib: backport < 3.2 for pinned_vm field
+
+Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
+
+diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c
+index 2bc1d2b..80d6ea5 100644
+--- a/drivers/infiniband/hw/qib/qib_user_pages.c
++++ b/drivers/infiniband/hw/qib/qib_user_pages.c
+@@ -74,7 +74,11 @@ static int __qib_get_user_pages(unsigned long start_page, size_t num_pages,
+                       goto bail_release;
+       }
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+       current->mm->pinned_vm += num_pages;
++#else
++      current->mm->locked_vm += num_pages;
++#endif
+       ret = 0;
+       goto bail;
+@@ -151,7 +155,11 @@ void qib_release_user_pages(struct page **p, size_t num_pages)
+       __qib_release_user_pages(p, num_pages, 1);
+       if (current->mm) {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+               current->mm->pinned_vm -= num_pages;
++#else
++              current->mm->locked_vm -= num_pages;
++#endif
+               up_write(&current->mm->mmap_sem);
+       }
+ }