Update to 390.116-1

3 files changed, 3 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98f67aa16310..497546ab9755 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Feb 23 22:45:45 UTC 2019
+# Sat Feb 23 22:51:36 UTC 2019
 pkgbase = nvidia-390xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 390xx legacy branch.
 	pkgver = 390.116
@@ -20,10 +20,8 @@ pkgbase = nvidia-390xx-ck
 	options = !strip
 	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 = unfuck.patch
 	sha256sums = de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f
 	sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
-	sha256sums = fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080
 
 pkgname = nvidia-390xx-ck
 
diff --git a/PKGBUILD b/PKGBUILD
index 50fc53d3f94e..3542352bded8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,10 +18,9 @@ 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 unfuck.patch)
+kernel-4.16.patch)
 sha256sums=('de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f'
-            '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
-            'fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080')
+            '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
 
 _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
@@ -32,9 +31,6 @@ prepare() {
     # Restore phys_to_dma support (still needed for 396.18)
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
-
-    # https://bugs.archlinux.org/task/59199
-    patch -Np1 -i ../unfuck.patch
 }
 
 build() {
diff --git a/unfuck.patch b/unfuck.patch
deleted file mode 100644
index dc58bff0018d..000000000000
--- a/unfuck.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urp work.orig/kernel/common/inc/nv-linux.h work/kernel/common/inc/nv-linux.h
---- work.orig/kernel/common/inc/nv-linux.h	2017-09-29 06:17:46.000000000 +0200
-+++ work/kernel/common/inc/nv-linux.h	2017-10-08 00:52:42.721523788 +0200
-@@ -1189,7 +1189,8 @@ extern void *nvidia_stack_t_cache;
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
- #define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
-     kmem_cache_create(name, size, align, flags, ctor)
--
-+#define NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, size, align, flags, useroffset, usersize, ctor) \
-+    kmem_cache_create_usercopy(name, size, align, flags, useroffset, usersize, ctor)
- #else
- #define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
-     kmem_cache_create(name, size, align, flags, ctor, NULL)
-@@ -1198,6 +1199,9 @@ extern void *nvidia_stack_t_cache;
- #define NV_KMEM_CACHE_CREATE(name, type)    \
-     NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL)
- 
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type)    \
-+    NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, sizeof(type), 0, 0, 0, sizeof(type), NULL)
-+
- #define NV_KMEM_CACHE_DESTROY(kmem_cache)   \
-     kmem_cache_destroy(kmem_cache)
- 
-diff -urp work.orig/kernel/nvidia/nv.c work/kernel/nvidia/nv.c
---- work.orig/kernel/nvidia/nv.c	2017-09-29 06:17:45.000000000 +0200
-+++ work/kernel/nvidia/nv.c	2017-10-08 00:52:42.721523788 +0200
-@@ -682,7 +682,7 @@ int __init nvidia_init_module(void)
- 
-     nv_memdbg_init();
- 
--    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,
-+    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name,
-                                                 nvidia_stack_t);
-     if (nvidia_stack_t_cache == NULL)
-     {