Update to 340.104 for linux-rt=4.11 kernel

4 files changed, 69 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7665d26ca06d..3f9c6d7e4c3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,33 @@
 # Generated by mksrcinfo v8
-# Thu Sep  7 23:15:19 UTC 2017
+# Tue Oct 10 18:32:02 UTC 2017
 pkgbase = nvidia-340xx-rt
 	pkgdesc = NVIDIA drivers for linux-rt, 340xx legacy branch
-	pkgver = 340.102
+	pkgver = 340.104
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-340xx-rt.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = nvidia-340xx-libgl=340.102
-	makedepends = nvidia-340xx-utils=340.102
+	makedepends = nvidia-340xx-libgl
+	makedepends = nvidia-340xx-utils=340.104
 	makedepends = linux-rt
-	makedepends = linux-rt-headers>=4.8
-	makedepends = linux-rt-headers<4.9
-	depends = linux-rt>=4.8
-	depends = linux-rt<4.9
+	makedepends = linux-rt-headers>=4.11
+	makedepends = linux-rt-headers<4.12
+	depends = linux-rt>=4.11
+	depends = linux-rt<4.12
 	depends = libgl
-	depends = nvidia-340xx-utils=340.102
+	depends = nvidia-340xx-utils=340.104
 	conflicts = nvidia-rt
 	conflicts = nvidia-last-rt
 	conflicts = nvidia-rt-lts
 	options = !strip
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/340.102/NVIDIA-Linux-x86-340.102.run
-	md5sums_i686 = 61aad6a98238bc61466e6a9e392cfd08
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/340.102/NVIDIA-Linux-x86_64-340.102-no-compat32.run
-	md5sums_x86_64 = 81e720487caa2823586b32659da9acc1
+	source = kernel-4.11.patch
+	md5sums = e09208cdee41f89ae787f86c602c69d2
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/340.104/NVIDIA-Linux-x86-340.104.run
+	md5sums_i686 = 42e9c98e156f6ac2658ee526d796a428
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/340.104/NVIDIA-Linux-x86_64-340.104-no-compat32.run
+	md5sums_x86_64 = efbd37cde63d50f657d55a6f2b321142
 
 pkgname = nvidia-340xx-rt
 
diff --git a/PKGBUILD b/PKGBUILD
index 52b70f5661aa..6abad2cfc80d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,28 @@
 # Contributor:  Morgan Cox <morgancoxuk@gmail.com>
 # Contributor: Joakim Hernberg <jbh@alchemy.lu>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
-# Contributor: 325.15 - patch : Ninez 
+# Contributor: 325.15 - patch : Ninez
 
 pkgname=nvidia-340xx-rt
-pkgver=340.102
-_extramodules=extramodules-4.8-rt
+pkgver=340.104
+_extramodules=extramodules-4.11-rt
 pkgrel=1
 pkgdesc="NVIDIA drivers for linux-rt, 340xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-rt>=4.8' 'linux-rt<4.9' 'libgl' "nvidia-340xx-utils=${pkgver}")
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux-rt' 'linux-rt-headers>=4.8' 'linux-rt-headers<4.9')
+depends=('linux-rt>=4.11' 'linux-rt<4.12' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('nvidia-340xx-libgl' "nvidia-340xx-utils=${pkgver}" 'linux-rt' 'linux-rt-headers>=4.11' 
+'linux-rt-headers<4.12')
 conflicts=('nvidia-rt' 'nvidia-last-rt' 'nvidia-rt-lts')
 license=('custom')
 install=${pkgname}.install
 options=(!strip)
+source=('kernel-4.11.patch')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums_i686=('61aad6a98238bc61466e6a9e392cfd08')
-md5sums_x86_64=('81e720487caa2823586b32659da9acc1')
+md5sums=('e09208cdee41f89ae787f86c602c69d2')
+md5sums_i686=('42e9c98e156f6ac2658ee526d796a428')
+md5sums_x86_64=('efbd37cde63d50f657d55a6f2b321142')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -29,6 +32,9 @@ md5sums_x86_64=('81e720487caa2823586b32659da9acc1')
 prepare() {
     rm -Rf "${srcdir}/${_pkg}"
     sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+
+    patch -Np0 < "${srcdir}/kernel-4.11.patch"
 }
 
 build() {
diff --git a/kernel-4.11.patch b/kernel-4.11.patch
new file mode 100644
index 000000000000..b2b3a7a9d958
--- /dev/null
+++ b/kernel-4.11.patch
@@ -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;
diff --git a/nvidia-340xx-rt.install b/nvidia-340xx-rt.install
index 55898049eef5..6fbc0feb081b 100644
--- a/nvidia-340xx-rt.install
+++ b/nvidia-340xx-rt.install
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.8-rt'
+    EXTRAMODULES='extramodules-4.11-rt'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-4.8-rt'
+    EXTRAMODULES='extramodules-4.11-rt'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
         echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@ post_upgrade() {
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-4.8-rt'
+    EXTRAMODULES='extramodules-4.11-rt'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }