[nvidia-kmod] Revert "uvm is x86_64 only"
commit 093e8d7655fba5b527bf45a9773d5def60b838bb
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 23 15:43:31 2017 +0100
Revert "uvm is x86_64 only"
This reverts commit a36344c9e8a0b4dec0392a21d30c4c27fd390106.
4.13_hack_license_as_kernel_devs_hate_us-part2.patch | 13 -------------
....patch => 4.13_hack_license_as_kernel_devs_hate_us.patch | 13 +++++++++++++
nvidia-kmod.spec | 6 +-----
3 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/4.13_hack_license_as_kernel_devs_hate_us-part1.patch
b/4.13_hack_license_as_kernel_devs_hate_us.patch
similarity index 81%
rename from 4.13_hack_license_as_kernel_devs_hate_us-part1.patch
rename to 4.13_hack_license_as_kernel_devs_hate_us.patch
index 84c149b..eddcb4c 100644
--- a/4.13_hack_license_as_kernel_devs_hate_us-part1.patch
+++ b/4.13_hack_license_as_kernel_devs_hate_us.patch
@@ -78,3 +78,16 @@ diff -uNrp a/kernel/nvidia-modeset/nvidia-modeset-linux.c
b/kernel/nvidia-modese
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
#endif
+diff -uNrp a/kernel/nvidia-uvm/uvm_common.c b/kernel/nvidia-uvm/uvm_common.c
+--- a/kernel/nvidia-uvm/uvm_common.c 2017-09-20 02:33:10.000000000 +0100
++++ b/kernel/nvidia-uvm/uvm_common.c 2017-09-23 09:02:44.989610766 +0100
+@@ -388,5 +388,9 @@ module_param(uvm_enable_builtin_tests, i
+ MODULE_PARM_DESC(uvm_enable_builtin_tests,
+ "Enable the UVM built-in tests. (This is a security risk)");
+
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0)
++MODULE_LICENSE("Dual MIT/GPL");
++#else
+ MODULE_LICENSE("MIT");
++#endif
+ MODULE_INFO(supported, "external");
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index c9163c9..d970f32 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -19,8 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
-Patch2: 4.13_hack_license_as_kernel_devs_hate_us-part1.patch
-Patch3: 4.13_hack_license_as_kernel_devs_hate_us-part2.patch
+Patch2: 4.13_hack_license_as_kernel_devs_hate_us.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -47,9 +46,6 @@ tar --use-compress-program xz -xf
%{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%ifarch x86_64
-%patch3 -p1
-%endif
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}