From: Mike Marciniszyn <mike.marciniszyn@intel.com>
Date: Wed, 25 Jul 2012 16:08:06 +0000 (-0400)
Subject: IB/qib: backport < 3.2 for pinned_vm field
X-Git-Tag: vofed-3.5-x~51^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0fc2ca05ddb22fa04b0f89366c0ed5c252fbc68a;p=~emulex%2Fcompat-rdma.git

IB/qib: backport < 3.2 for pinned_vm field

Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
---

diff --git a/patches/0010-qib-pinned-vm.patch b/patches/0010-qib-pinned-vm.patch
new file mode 100644
index 0000000..ef850c2
--- /dev/null
+++ b/patches/0010-qib-pinned-vm.patch
@@ -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);
+ 	}
+ }