From 66e831301f8600c42db98daaeb57aa16613d5d98 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Oct 2019 20:29:25 +0200
Subject: [PATCH] nvidia340: add patch for linux5.3 compatibility

---
 srcpkgs/nvidia340/files/kernel-5.3.patch | 49 ++++++++++++++++++++++++
 srcpkgs/nvidia340/template               |  3 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia340/files/kernel-5.3.patch

diff --git a/srcpkgs/nvidia340/files/kernel-5.3.patch b/srcpkgs/nvidia340/files/kernel-5.3.patch
new file mode 100644
index 00000000000..c51a41d5d8f
--- /dev/null
+++ b/srcpkgs/nvidia340/files/kernel-5.3.patch
@@ -0,0 +1,49 @@
+diff --git kernel/nv-linux.h kernel/nv-linux.h
+index 4043bf1..62f0874 100644
+--- kernel/nv-linux.h
++++ kernel/nv-linux.h
+@@ -877,12 +877,21 @@ extern void *nv_stack_t_cache;
+         __ret;                                               \
+      })
+ #elif (NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT == 3)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ #define NV_SMP_CALL_FUNCTION(func, info, wait)               \
+     ({                                                       \
+         int __ret = smp_call_function(func, info, wait);     \
+         __ret;                                               \
+      })
+ #else
++#define NV_SMP_CALL_FUNCTION(func, info, wait)               \
++    ({                                                       \
++        int __ret = 0;                                       \
++        smp_call_function(func, info, wait);                 \
++        __ret;                                               \
++     })
++#endif
++#else
+ #error "NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT value unrecognized!"
+ #endif
+ #elif defined(CONFIG_SMP)
+@@ -897,12 +906,21 @@ extern void *nv_stack_t_cache;
+         __ret;                                         \
+      })
+ #elif (NV_ON_EACH_CPU_ARGUMENT_COUNT == 3)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+ #define NV_ON_EACH_CPU(func, info, wait)               \
+     ({                                                 \
+         int __ret = on_each_cpu(func, info, wait);     \
+         __ret;                                         \
+      })
+ #else
++#define NV_ON_EACH_CPU(func, info, wait)               \
++    ({                                                 \
++        int __ret = 0;                                 \
++        on_each_cpu(func, info, wait);                 \
++        __ret;                                         \
++    })
++#endif
++#else
+ #error "NV_ON_EACH_CPU_ARGUMENT_COUNT value unrecognized!"
+ #endif
+ #elif defined(CONFIG_SMP)
+
diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template
index 25d6953db03..9b4fbbaa73f 100644
--- a/srcpkgs/nvidia340/template
+++ b/srcpkgs/nvidia340/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)"
 
 pkgname=nvidia340
 version=340.107
-revision=4
+revision=5
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -43,6 +43,7 @@ do_patch() {
 	patch -p0 < ${FILESDIR}/kernel-4.11.patch
 	patch -p0 < ${FILESDIR}/kernel-5.0.patch
 	patch -p0 < ${FILESDIR}/kernel-5.1.patch
+	patch -p0 < ${FILESDIR}/kernel-5.3.patch
 }
 
 do_install() {