[packages/xorg-driver-video-nvidia-legacy-390xx] - fix building with kernel 5.2 - rel 4
baggins
baggins at pld-linux.org
Fri Jul 12 16:01:02 CEST 2019
commit 3f474270ed6759ce438b7826577dcde75f12ccc7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jul 12 22:00:35 2019 +0800
- fix building with kernel 5.2
- rel 4
kernel-5.2.patch | 29 +++++++++++++++++++++++++++++
xorg-driver-video-nvidia-legacy-390xx.spec | 4 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index 991d514..dea3720 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -33,7 +33,7 @@ exit 1
%define no_install_post_check_so 1
-%define rel 3
+%define rel 4
%define pname xorg-driver-video-nvidia-legacy-390xx
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -57,6 +57,7 @@ Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-desktop.patch
Patch2: kernel-5.1.patch
Patch3: kernel-5.1-x8664.patch
+Patch4: kernel-5.2.patch
URL: http://www.nvidia.com/object/unix.html
BuildRequires: rpmbuild(macros) >= 1.701
%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -274,6 +275,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
%ifarch %{x8664}
%patch3 -p1
%endif
+%patch4 -p1
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
%build
diff --git a/kernel-5.2.patch b/kernel-5.2.patch
new file mode 100644
index 0000000..22f3b99
--- /dev/null
+++ b/kernel-5.2.patch
@@ -0,0 +1,29 @@
+--- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-uvm/uvm8_tools.c~ 2019-01-28 00:12:22.000000000 +0800
++++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-uvm/uvm8_tools.c 2019-07-12 21:57:52.529905949 +0800
+@@ -204,7 +204,7 @@
+ return event_tracker != NULL && !event_tracker->is_queue;
+ }
+
+-static void put_user_pages(struct page **pages, NvU64 page_count)
++static void nv_put_user_pages(struct page **pages, NvU64 page_count)
+ {
+ NvU64 i;
+ for (i = 0; i < page_count; i++)
+@@ -215,7 +215,7 @@
+ {
+ size = DIV_ROUND_UP(size, PAGE_SIZE);
+ vunmap((NvU8 *)addr);
+- put_user_pages(pages, size);
++ nv_put_user_pages(pages, size);
+ uvm_kvfree(pages);
+ }
+
+@@ -279,7 +279,7 @@
+ uvm_kvfree(vmas);
+
+ if (ret > 0)
+- put_user_pages(*pages, ret);
++ nv_put_user_pages(*pages, ret);
+ else if (ret < 0)
+ status = errno_to_nv_status(ret);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-390xx.git/commitdiff/3f474270ed6759ce438b7826577dcde75f12ccc7
More information about the pld-cvs-commit
mailing list