commit 90256aab169bddc318803b63c02222f2c5c4bb10
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Mon Jun 18 19:47:41 2018 +0200
- fix building with kernel 4.17
- rel 2
kernel-4.17.patch | 14 ++++++++++++++
lin_tape.spec | 4 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/lin_tape.spec b/lin_tape.spec
index 43d1605..2c13a8b 100644
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -5,7 +5,7 @@
# 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}
@@ -25,6 +25,7 @@ Patch5: linux-4.12.patch
Patch6: linux-4.13.patch
Patch7: kernel-4.14.patch
Patch8: kernel-4.15.patch
+Patch9: kernel-4.17.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
@@ -81,6 +82,7 @@ compatible platforms.\
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
install -p %{SOURCE1} .
diff --git a/kernel-4.17.patch b/kernel-4.17.patch
new file mode 100644
index 0000000..3902b9d
--- /dev/null
+++ b/kernel-4.17.patch
@@ -0,0 +1,14 @@
+--- lin_tape-3.0.23/intercept.c~ 2018-06-18 19:40:39.000000000 +0200
++++ lin_tape-3.0.23/intercept.c 2018-06-18 19:43:27.059968542 +0200
+@@ -1365,7 +1365,11 @@
+ /* Only for fo devices */
+ /* This 'if' must match the one above in create unique */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)
++ sdev->request_queue = blk_alloc_queue_node(GFP_KERNEL,
NUMA_NO_NODE, NULL);
++ #else
+ sdev->request_queue = blk_alloc_queue_node(GFP_KERNEL,
NUMA_NO_NODE);
++ #endif
+ __scsi_init_queue(sdev->host, sdev->request_queue);
+ #else
+ sdev->request_queue = __scsi_alloc_queue(sdev->host, NULL);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/90256aab169bddc318803b63c02222f2c5c4bb10
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
