Date: Tuesday, May 14, 2019 @ 19:18:57 Author: heftig Revision: 353263
340.107-81 Added: nvidia-340xx/trunk/kernel-5.1.patch Modified: nvidia-340xx/trunk/PKGBUILD ------------------+ PKGBUILD | 8 +++++--- kernel-5.1.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-14 19:18:55 UTC (rev 353262) +++ PKGBUILD 2019-05-14 19:18:57 UTC (rev 353263) @@ -6,7 +6,7 @@ pkgname=(nvidia-340xx nvidia-340xx-dkms) pkgver=340.107 _extramodules=extramodules-ARCH -pkgrel=80 +pkgrel=81 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" arch=('x86_64') url="http://www.nvidia.com/" @@ -15,10 +15,11 @@ license=('custom') options=('!strip') source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - 'kernel-4.11.patch' 'kernel-5.0.patch') + 'kernel-4.11.patch' 'kernel-5.0.patch' 'kernel-5.1.patch') sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f' 'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2' - 'ad60f9d09b6e8d5038375f9ddaab93341958f9400f40f5175857e44c7f7002d481121dc5d677703551c3cdf24069939ac6a1861920a455acf40e637f24234a56') + 'ad60f9d09b6e8d5038375f9ddaab93341958f9400f40f5175857e44c7f7002d481121dc5d677703551c3cdf24069939ac6a1861920a455acf40e637f24234a56' + '419ab2ebd2d4ba2280ef4bb14ffe8ced364b183ebc18492bfe5ae5e83ff2c1cd99e192028f247df94b079c6ff7863a49f1f83237c16dd11421672a1613aa0685') _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -29,6 +30,7 @@ patch -Np0 < "${srcdir}/kernel-4.11.patch" patch -Np0 < "${srcdir}/kernel-5.0.patch" + patch -Np0 < "${srcdir}/kernel-5.1.patch" cp -a kernel kernel-dkms } Added: kernel-5.1.patch =================================================================== --- kernel-5.1.patch (rev 0) +++ kernel-5.1.patch 2019-05-14 19:18:57 UTC (rev 353263) @@ -0,0 +1,29 @@ +diff --git kernel/uvm/nvidia_uvm_lite.c kernel/uvm/nvidia_uvm_lite.c +index 65b9a4d..f5ea5d7 100644 +--- kernel/uvm/nvidia_uvm_lite.c ++++ kernel/uvm/nvidia_uvm_lite.c +@@ -830,8 +830,10 @@ done: + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) +-#else +-int _fault(struct vm_fault *vmf) ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) ++int _fault(struct vm_fault *vmf) ++#else ++vm_fault_t _fault(struct vm_fault *vmf) + #endif + { + #if defined(NV_VM_FAULT_HAS_ADDRESS) +@@ -886,8 +888,10 @@ static struct vm_operations_struct uvmlite_vma_ops = + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) + int _sigbus_fault(struct vm_fault *vmf) ++#else ++vm_fault_t _sigbus_fault(struct vm_fault *vmf) + #endif + { + vmf->page = NULL;