summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2019-07-21 06:15:45 -0400
committergraysky2019-07-21 06:16:38 -0400
commit7d8b9e679d94052c733bb4e247b9d2e7f7763b7b (patch)
tree620a74e1a5446ff746490fbeca103e8cc5ea1ffe
parentc0b9cbf1f1fc56a491a7e59f15b7784e42fbf366 (diff)
downloadaur-7d8b9e679d94052c733bb4e247b9d2e7f7763b7b.tar.gz
Update to 390.116-36
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--kernel-5.2.patch18
3 files changed, 26 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53662328280..15442e9b1c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nvidia-390xx-ck
pkgdesc = NVIDIA drivers for linux-ck, 390xx legacy branch.
pkgver = 390.116
- pkgrel = 35
+ pkgrel = 36
url = http://www.nvidia.com/
arch = x86_64
license = custom
@@ -17,9 +17,11 @@ pkgbase = nvidia-390xx-ck
source = http://us.download.nvidia.com/XFree86/Linux-x86_64/390.116/NVIDIA-Linux-x86_64-390.116-no-compat32.run
source = kernel-4.16.patch
source = kernel-5.1.patch
+ source = kernel-5.2.patch
sha256sums = de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f
sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
sha256sums = d92899d4f7a40e2c3cad92d067f2f53c3a18c49b34e62e707a93b125aa37640f
+ sha256sums = 9d94f30662d64400ee43bb7745544b72e1c6216a30ae2907a744c7ae0aa6e384
pkgname = nvidia-390xx-ck
diff --git a/PKGBUILD b/PKGBUILD
index d4e1fcd5e05..d1f1edd1ffc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=nvidia-390xx-ck
pkgver=390.116
-pkgrel=35
+pkgrel=36
_extramodules=extramodules-ck
_pkgdesc="NVIDIA drivers for linux-ck, 390xx legacy branch."
pkgdesc="$_pkgdesc"
@@ -18,10 +18,11 @@ conflicts=('nvidia-340xx-ck' 'nvidia-ck')
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.16.patch' 'kernel-5.1.patch')
+'kernel-4.16.patch' 'kernel-5.1.patch' 'kernel-5.2.patch')
sha256sums=('de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f'
'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
- 'd92899d4f7a40e2c3cad92d067f2f53c3a18c49b34e62e707a93b125aa37640f')
+ 'd92899d4f7a40e2c3cad92d067f2f53c3a18c49b34e62e707a93b125aa37640f'
+ '9d94f30662d64400ee43bb7745544b72e1c6216a30ae2907a744c7ae0aa6e384')
_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -32,6 +33,7 @@ prepare() {
patch -Np1 -i ../kernel-4.16.patch
patch -Np1 -i ../kernel-5.1.patch
+ patch -Np1 -i ../kernel-5.2.patch
}
build() {
diff --git a/kernel-5.2.patch b/kernel-5.2.patch
new file mode 100644
index 00000000000..344771d27d8
--- /dev/null
+++ b/kernel-5.2.patch
@@ -0,0 +1,18 @@
+diff -u -r a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
+--- a/kernel/nvidia-uvm/uvm8_tools.c 2019-01-27 16:12:22.000000000 +0000
++++ b/kernel/nvidia-uvm/uvm8_tools.c 2019-07-09 04:42:40.134899491 +0000
+@@ -204,12 +204,14 @@
+ return event_tracker != NULL && !event_tracker->is_queue;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ static void put_user_pages(struct page **pages, NvU64 page_count)
+ {
+ NvU64 i;
+ for (i = 0; i < page_count; i++)
+ put_page(pages[i]);
+ }
++#endif
+
+ static void unmap_user_pages(struct page **pages, void *addr, NvU64 size)
+ {