[nvidia-kmod] fix build
by Leigh Scott
commit 7fff178403247b792eb5a99c853054f2862206c5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 15:30:42 2016 +0100
fix build
nvidia-4.7_kernel-pt1.patch | 15 +++++++++++++++
nvidia-4.7_kernel.patch => nvidia-4.7_kernel_pt2.patch | 15 ---------------
nvidia-kmod.spec | 6 +++++-
3 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/nvidia-4.7_kernel-pt1.patch b/nvidia-4.7_kernel-pt1.patch
new file mode 100644
index 0000000..ca4618d
--- /dev/null
+++ b/nvidia-4.7_kernel-pt1.patch
@@ -0,0 +1,15 @@
+--- a/kernel/nvidia-uvm/uvm_linux.h
++++ b/kernel/nvidia-uvm/uvm_linux.h
+@@ -563,7 +563,11 @@
+ INIT_RADIX_TREE(tree, GFP_NOWAIT);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++static bool radix_tree_is_empty(struct radix_tree_root *tree)
++#else
+ static bool radix_tree_empty(struct radix_tree_root *tree)
++#endif
+ {
+ void *dummy;
+ return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
+
diff --git a/nvidia-4.7_kernel.patch b/nvidia-4.7_kernel_pt2.patch
similarity index 72%
rename from nvidia-4.7_kernel.patch
rename to nvidia-4.7_kernel_pt2.patch
index 11a53da..833519e 100644
--- a/nvidia-4.7_kernel.patch
+++ b/nvidia-4.7_kernel_pt2.patch
@@ -1,18 +1,3 @@
---- a/kernel/nvidia-uvm/uvm_linux.h
-+++ b/kernel/nvidia-uvm/uvm_linux.h
-@@ -563,7 +563,11 @@
- INIT_RADIX_TREE(tree, GFP_NOWAIT);
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+static bool radix_tree_is_empty(struct radix_tree_root *tree)
-+#else
- static bool radix_tree_empty(struct radix_tree_root *tree)
-+#endif
- {
- void *dummy;
- return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
-
--- a/kernel/nvidia-drm/nvidia-drm-fb.c
+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
@@ -24,6 +24,7 @@
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index aef293b..fb3e343 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -19,7 +19,8 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
-Patch2: nvidia-4.7_kernel.patch
+Patch2: nvidia-4.7_kernel-pt1.patch
+Patch3: nvidia-4.7_kernel_pt2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +48,10 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
+%ifarch x86_64
%patch2 -p1
+%endif
+%patch3 -p1
for kernel_version in %{?kernel_versions} ; do
8 years, 4 months
[nvidia-kmod/f23] fix build
by Leigh Scott
Summary of changes:
9e3a705... fix build (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[nvidia-kmod/f24: 2/2] Merge branch 'master' into f24
by Leigh Scott
commit 5f31d8d475a36dec73d46dc998027c7a1f7ea8ee
Merge: 6e118c4 9e3a705
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 15:14:13 2016 +0100
Merge branch 'master' into f24
nv-linux-arm.patch | 2 +-
nv-linux-arm2.patch | 2 +-
nvidia-kmod.spec | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
---
8 years, 4 months
[nvidia-kmod] fix build
by Leigh Scott
commit 9e3a7059d776543568e04680f0316415474023b5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 15:13:34 2016 +0100
fix build
nv-linux-arm.patch | 2 +-
nv-linux-arm2.patch | 2 +-
nvidia-kmod.spec | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/nv-linux-arm.patch b/nv-linux-arm.patch
index a17f940..6e382ae 100644
--- a/nv-linux-arm.patch
+++ b/nv-linux-arm.patch
@@ -1,7 +1,7 @@
diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.arm nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h
--- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.arm 2015-01-11 04:30:46.000000000 +0000
+++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h 2015-01-16 23:20:16.785229307 +0000
-@@ -240,7 +240,8 @@ NV_STATUS nvos_forward_error_to_cray(str
+@@ -257,7 +257,8 @@ NV_STATUS nvos_forward_error_to_cray(str
* NVIDIA graphics driver has no way of knowing and is unlikely
* to work correctly.
*/
diff --git a/nv-linux-arm2.patch b/nv-linux-arm2.patch
index 409d851..f03eb32 100644
--- a/nv-linux-arm2.patch
+++ b/nv-linux-arm2.patch
@@ -1,7 +1,7 @@
diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.swf nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h
--- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.swf 2015-07-22 02:40:54.000000000 +0200
+++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h 2015-07-29 14:07:14.866367595 +0200
-@@ -148,7 +148,7 @@ static inline uid_t __kuid_val(kuid_t ui
+@@ -153,7 +153,7 @@ static inline uid_t __kuid_val(kuid_t ui
#include <linux/dma-mapping.h>
#endif
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 5507b17..aef293b 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -4,6 +4,7 @@
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
%global buildforkernels akmod
+%global debug_package %{nil}
Name: nvidia-kmod
Epoch: 1
8 years, 4 months
[nvidia-kmod/f23] use akmod instead
by Leigh Scott
Summary of changes:
61d8b51... use akmod instead (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[nvidia-kmod/f24: 2/2] Merge branch 'master' into f24
by Leigh Scott
commit 6e118c46c86ce63e2c7caa503765706d0ab870f5
Merge: 8512ae5 61d8b51
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 14:52:46 2016 +0100
Merge branch 'master' into f24
nvidia-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
8 years, 4 months
[nvidia-kmod] use akmod instead
by Leigh Scott
commit 61d8b51fb1ea87209d7fd0da9fdb6f4351dbdd1f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 14:52:03 2016 +0100
use akmod instead
nvidia-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 798d790..5507b17 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels akmods
+%global buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
8 years, 4 months