From: Pawel Schulfer <pawel.schulfer@intel.com>
Date: Wed, 7 Jun 2017 08:35:37 +0000 (+0200)
Subject: Support for Kernel 4.8 in QIB on OFED-4.8
X-Git-Tag: vofed-4.8~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=54931166983d20cf7d12c47f081fd5e86de1cb32;p=compat-rdma%2Fcompat-rdma.git

Support for Kernel 4.8 in QIB on OFED-4.8

Changes included in this patch:
1) Remove check if get_user_pages have 6 params from qib_user_pages.c

Signed-off-by: Pawel Schulfer <pawel.schulfer@intel.com>
---

diff --git a/patches/0010-BACKPORT-qib.patch b/patches/0010-BACKPORT-qib.patch
index b8ecb2e..a4724c6 100644
--- a/patches/0010-BACKPORT-qib.patch
+++ b/patches/0010-BACKPORT-qib.patch
@@ -176,23 +176,16 @@ diff -durp a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qi
 diff -durp a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c
 --- a/drivers/infiniband/hw/qib/qib_user_pages.c
 +++ b/drivers/infiniband/hw/qib/qib_user_pages.c
-@@ -66,9 +66,16 @@ static int __qib_get_user_pages(unsigned
+@@ -66,7 +66,8 @@ static int __qib_get_user_pages(unsigned
  	}
  
  	for (got = 0; got < num_pages; got += ret) {
-+#ifdef HAVE_GET_USER_PAGES_6_PARAMS
- 		ret = get_user_pages(start_page + got * PAGE_SIZE,
- 				     num_pages - got, 1, 1,
- 				     p + got, NULL);
-+#else
+-		ret = get_user_pages(start_page + got * PAGE_SIZE,
 +		ret = get_user_pages(current, current->mm,
 +				     start_page + got * PAGE_SIZE,
-+				     num_pages - got, 1, 1,
-+				     p + got, NULL);
-+#endif
+ 				     num_pages - got, 1, 1,
+ 				     p + got, NULL);
  		if (ret < 0)
- 			goto bail_release;
- 	}
 diff -durp a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
 --- a/drivers/infiniband/hw/qib/qib_pcie.c
 +++ b/drivers/infiniband/hw/qib/qib_pcie.c