[nvidia-390xx-kmod] Clean up build fix for 4.20 kernel (untested)
commit c82d71d0584ff4e111bd2ce846a3653d31a2f513
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Jan 24 11:12:33 2019 +0000
Clean up build fix for 4.20 kernel (untested)
4.20_kernel.patch | 6 +++---
nvidia-390xx-kmod.spec | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/4.20_kernel.patch b/4.20_kernel.patch
index 546ea5a..a3d409b 100644
--- a/4.20_kernel.patch
+++ b/4.20_kernel.patch
@@ -12,7 +12,7 @@
struct nv_ipmi_softc
{
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
ipmi_user_t p_user; // ptr to ipmi_msghandler user structure
+#else
+ struct ipmi_user *p_user;
@@ -24,7 +24,7 @@
static inline int
nv_ipmi_set_my_address
(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
ipmi_user_t user,
+#else
+ struct ipmi_user *user,
@@ -47,7 +47,7 @@
page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
ret = vm_insert_pfn(vma, address, pfn + page_offset);
+#else
+ ret = vmf_insert_pfn(vma, address, pfn + page_offset);
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 74125f1..7682650 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.87
# Taken over by kmodtool
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -75,6 +75,9 @@ done
%changelog
+* Thu Jan 24 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.87-5
+- Clean up build fix for 4.20 kernel (untested)
+
* Mon Dec 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.87-4
- Build fix for 4.20 kernel (untested)