From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 2 Apr 2022 21:12:59 +0000 (+0200)
Subject: - uvm module does not exist on i686, rel 5
X-Git-Tag: auto/th/xorg-driver-video-nvidia-legacy-390xx-390.147-5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia-legacy-390xx.git;a=commitdiff_plain;h=69ffae85b362723eeafe18ffe673288b1ab194f4

- uvm module does not exist on i686, rel 5
---

diff --git a/kernel-5.17-x8664.patch b/kernel-5.17-x8664.patch
new file mode 100644
index 0000000..1d08e9a
--- /dev/null
+++ b/kernel-5.17-x8664.patch
@@ -0,0 +1,10 @@
+--- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-uvm/nvidia-uvm.Kbuild~	2021-12-13 15:04:30.000000000 +0100
++++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-uvm/nvidia-uvm.Kbuild	2022-04-02 21:49:28.303986549 +0200
+@@ -103,6 +103,7 @@
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += wait_on_bit_lock_argument_count
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += bitmap_clear
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += usleep_range
diff --git a/kernel-5.17.patch b/kernel-5.17.patch
index 14f44fb..fa70b7f 100644
--- a/kernel-5.17.patch
+++ b/kernel-5.17.patch
@@ -55,13 +55,3 @@
  NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove
  NV_CONFTEST_FUNCTION_COMPILE_TESTS += timer_setup
  NV_CONFTEST_FUNCTION_COMPILE_TESTS += do_gettimeofday
---- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-uvm/nvidia-uvm.Kbuild~	2021-12-13 15:04:30.000000000 +0100
-+++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-uvm/nvidia-uvm.Kbuild	2022-04-02 21:49:28.303986549 +0200
-@@ -103,6 +103,7 @@
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += wait_on_bit_lock_argument_count
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += bitmap_clear
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += usleep_range
diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index d8be9e1..d5bc2c8 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -29,7 +29,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	4
+%define		rel	5
 %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
@@ -52,6 +52,7 @@ Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
 Patch2:		kernel-5.17.patch
+Patch3:		kernel-5.17-x8664.patch
 URL:		https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
@@ -312,8 +313,9 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
-%if %{with kernel}
 %patch2 -p1
+%ifarch %{x8664}
+%patch3 -p1
 %endif
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild