[nvidia-340xx-kmod/f30] patch for kernel-5.3.0

commit 799147b0b1236ffbc229f2d803bce7322f1afa26 Author: João Carlos Mendes Luís <jonny(a)corp.globo.com&gt; Date: Sun Nov 24 18:04:38 2019 -0300 patch for kernel-5.3.0 buildfix_kernel_5.3.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++ nvidia-340xx-kmod.spec | 7 ++++++- 2 files changed, 55 insertions(+), 1 deletion(-) --- diff --git a/buildfix_kernel_5.3.patch b/buildfix_kernel_5.3.patch new file mode 100644 index 0000000..d18a0a3 --- /dev/null +++ b/buildfix_kernel_5.3.patch @@ -0,0 +1,49 @@ +diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h +index 4043bf1..62f0874 100644 +--- a/kernel/nv-linux.h ++++ b/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/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec index 5dfbba7..400c623 100644 --- a/nvidia-340xx-kmod.spec +++ b/nvidia-340xx-kmod.spec @@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod Epoch: 1 Version: 340.107 # Taken over by kmodtool -Release: 8%{?dist} +Release: 9%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -20,6 +20,7 @@ Source11: nvidia-kmodtool-excludekernel-filterfile Patch0: nv-linux-arm.patch Patch1: buildfix_kernel_5.0.patch Patch2: xf86-video-nvidia-legacy-02-fix-linux-5.1.patch +Patch3: buildfix_kernel_5.3.patch # needed for plague to make sure it builds for i586 and i686 #ExclusiveArch: i686 x86_64 armv7hl @@ -48,6 +49,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 for kernel_version in %{?kernel_versions} ; do cp -a kernel _kmod_build_${kernel_version%%___*} @@ -77,6 +79,9 @@ done %{?akmod_install} %changelog +* Sun Nov 24 2019 João Carlos Mendes Luís <redhat(a)jonny.eng.br&gt; - 1:340.107-9 +- patch for kernel-5.3.0 + * Mon Jun 03 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:340.107-8 - patch for kernel-5.1.0