[packages/xorg-driver-video-nvidia-legacy-390xx] fix build with kernel 6.10

atler atler at pld-linux.org
Sat Jul 27 02:36:22 CEST 2024


commit 93e63e8fbd98af0475ccad9769b40789d4ac333e
Author: Jan Palus <jpalus at fastmail.com>
Date:   Sat Jul 27 00:39:59 2024 +0200

    fix build with kernel 6.10

 kernel-6.10.patch                          | 14 ++++++++++++++
 xorg-driver-video-nvidia-legacy-390xx.spec |  2 ++
 2 files changed, 16 insertions(+)
---
diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index 357f735..49bff87 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -60,6 +60,7 @@ Patch7:		kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch
 Patch8:		kernel-6.5-handle-get_user_pages-vmas-argument-removal-x8664.patch
 Patch9:		kernel-6.6-backport-drm_gem_prime_handle_to_fd-changes-from-470.patch
 Patch10:	kernel-6.8.patch
+Patch11:	kernel-6.10.patch
 URL:		https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
@@ -338,6 +339,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
diff --git a/kernel-6.10.patch b/kernel-6.10.patch
new file mode 100644
index 0000000..5de4976
--- /dev/null
+++ b/kernel-6.10.patch
@@ -0,0 +1,14 @@
+--- NVIDIA-Linux-x86_64-390.157-no-compat32/kernel/nvidia/os-mlock.c.orig	2024-07-27 00:25:33.105745658 +0200
++++ NVIDIA-Linux-x86_64-390.157-no-compat32/kernel/nvidia/os-mlock.c	2024-07-27 00:32:40.621187969 +0200
+@@ -20,8 +20,10 @@
+ {
+ #if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
+     return unsafe_follow_pfn(vma, address, pfn);
+-#else
++#elif defined(NV_FOLLOW_PFN_PRESENT)
+     return follow_pfn(vma, address, pfn);
++#else
++    return -1;
+ #endif
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-390xx.git/commitdiff/93e63e8fbd98af0475ccad9769b40789d4ac333e



More information about the pld-cvs-commit mailing list