[arch-commits] Commit in nvidia-340xx-lts/trunk (3 files)

[Andreas Radke]

    Date: Wednesday, January 31, 2018 @ 10:23:52
  Author: andyrtr
Revision: 315667

upgpkg: nvidia-340xx-lts 340.106-4

kernel update 4.14.15 rebuild

Added:
  nvidia-340xx-lts/trunk/kernel-4.11.patch
Modified:
  nvidia-340xx-lts/trunk/PKGBUILD
  nvidia-340xx-lts/trunk/nvidia-340xx-lts.install

--------------------------+
 PKGBUILD                 |   15 +++++++++------
 kernel-4.11.patch        |   38 ++++++++++++++++++++++++++++++++++++++
 nvidia-340xx-lts.install |    6 +++---
 3 files changed, 50 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-31 10:16:55 UTC (rev 315666)
+++ PKGBUILD	2018-01-31 10:23:52 UTC (rev 315667)
@@ -3,19 +3,21 @@
 
 pkgname=nvidia-340xx-lts
 pkgver=340.106
-_extramodules=extramodules-4.9-lts
-pkgrel=3
+_extramodules=extramodules-4.14-lts
+pkgrel=4
 pkgdesc="NVIDIA drivers for linux-lts"
 arch=('x86_64')
 url="http://www.nvidia.com/"
-makedepends=('linux-lts>=4.9.78' 'linux-lts-headers>=4.9.78' "nvidia-340xx-utils=$pkgver")
+makedepends=('linux-lts>=4.14.15' 'linux-lts-headers>=4.14.15' "nvidia-340xx-utils=$pkgver")
 provides=('nvidia-340xx')
 conflicts=('nvidia-lts')
 license=('custom')
 install=${pkgname}.install
 options=(!strip)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums_x86_64=('37c84428b64696be2b104edbc9855f57')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+        'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+            'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
 
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
@@ -23,6 +25,7 @@
     sh ${_pkg}.run --extract-only
     cd "${_pkg}"
     # patches here
+    patch -Np0 < "${srcdir}/kernel-4.11.patch"
 }
 
 build() {
@@ -35,7 +38,7 @@
 }
 
 package() {
-  depends=('linux-lts>=4.9.78' "nvidia-340xx-utils=$pkgver" 'libgl')
+  depends=('linux-lts>=4.14.15' "nvidia-340xx-utils=$pkgver" 'libgl')
 
   install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
     "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko"

Added: kernel-4.11.patch
===================================================================
--- kernel-4.11.patch	                        (rev 0)
+++ kernel-4.11.patch	2018-01-31 10:23:52 UTC (rev 315667)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c	2017-09-27 13:50:46.334075042 +0200
++++ kernel/uvm/nvidia_uvm_lite.c	2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #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) 	
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+     unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+     struct page *page = NULL;
+     int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+     retval = _fault_common(vma, vaddr, &page, vmf->flags);
++#else
++    retval = _fault_common(NULL, vaddr, &page, vmf->flags);
++#endif
+ 
+     vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #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
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+     vmf->page = NULL;
+     return VM_FAULT_SIGBUS;

Modified: nvidia-340xx-lts.install
===================================================================
--- nvidia-340xx-lts.install	2018-01-31 10:16:55 UTC (rev 315666)
+++ nvidia-340xx-lts.install	2018-01-31 10:23:52 UTC (rev 315667)
@@ -1,15 +1,15 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.9-lts'
+    EXTRAMODULES='extramodules-4.14-lts'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-4.9-lts'
+    EXTRAMODULES='extramodules-4.14-lts'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-4.9-lts'
+    EXTRAMODULES='extramodules-4.14-lts'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }