- fix building with kernel 4.4.169

- rel 2

diff --git a/lin_tape.spec b/lin_tape.spec
index 00a9b463c64f22b4259c1c7e3828d012f6ddf52d..c145d29c1c046cc7e3d35feb2e7113cefe6793a2 100644 (file)
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -5,7 +5,7 @@
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 

-%define                rel     1
+%define                rel     2

 %define                pname   lin_tape
 Summary:       IBM Tape SCSI Device Driver for Linux
 Name:          %{pname}%{_alt_kernel}
 %define                pname   lin_tape
 Summary:       IBM Tape SCSI Device Driver for Linux
 Name:          %{pname}%{_alt_kernel}


@@ -26,6 +26,7 @@ Patch7:               kernel-4.14.patch
 Patch8:                kernel-4.15.patch
 Patch9:                kernel-4.17.patch
 Patch10:       kernel-4.19.patch
 Patch8:                kernel-4.15.patch
 Patch9:                kernel-4.17.patch
 Patch10:       kernel-4.19.patch

+Patch11:       linux-4.4.169.patch

 # System Storage, Tape systems, Tape drivers and software, Tape device drivers (Linux)
 URL:           http://www.ibm.com/support/fixcentral/
 BuildRequires: rpmbuild(macros) >= 1.701
 # System Storage, Tape systems, Tape drivers and software, Tape device drivers (Linux)
 URL:           http://www.ibm.com/support/fixcentral/
 BuildRequires: rpmbuild(macros) >= 1.701


@@ -83,6 +84,7 @@ compatible platforms.\
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1

+%patch11 -p1

 
 install -p %{SOURCE1} .
 
 
 install -p %{SOURCE1} .
 

diff --git a/linux-4.4.169.patch b/linux-4.4.169.patch
new file mode 100644 (file)
index 0000000..48ecbd8
--- /dev/null
+++ b/linux-4.4.169.patch
@@ -0,0 +1,12 @@
+--- lin_tape-3.0.33/lin_tape_scsi_tape.c~      2018-12-28 14:09:16.000000000 +0100
++++ lin_tape-3.0.33/lin_tape_scsi_tape.c       2018-12-28 14:12:49.237558696 +0100
+@@ -11843,6 +11843,9 @@
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
+       mapped_pages = get_user_pages((ulong)user_location, number_pages,
+                                             rw, 0, pages, NULL);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,169)
++      mapped_pages = get_user_pages(current, current->mm,
++              (ulong)user_location, number_pages, rw ? FOLL_WRITE : 0, pages, NULL);
+ #else
+       mapped_pages = get_user_pages(current, current->mm,
+               (ulong)user_location, number_pages, rw, 0, pages, NULL);