rpms/nvidia-kmod/devel nv-linux-arm2.patch, NONE, 1.1 nvidia-kmod.spec, 1.215, 1.216

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18748

Modified Files:
	nvidia-kmod.spec 
Added Files:
	nv-linux-arm2.patch 
Log Message:
Fix build on arm


nv-linux-arm2.patch:
 nv-linux.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nv-linux-arm2.patch ---
diff -up nvidiapkg-armv7hl/kernel/nv-linux.h.swf nvidiapkg-armv7hl/kernel/nv-linux.h
--- nvidiapkg-armv7hl/kernel/nv-linux.h.swf	2015-07-22 02:40:54.000000000 +0200
+++ nvidiapkg-armv7hl/kernel/nv-linux.h	2015-07-29 14:07:14.866367595 +0200
@@ -148,7 +148,7 @@ static inline uid_t __kuid_val(kuid_t ui
 #include <linux/dma-mapping.h>
 #endif
 
-#if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+#if defined(CONFIG_SWIOTLB) && (defined(NVCPU_AARCH64) || defined(NVCPU_ARM))
 #include <linux/swiotlb.h>
 #endif
 


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- nvidia-kmod.spec	29 Jul 2015 03:52:44 -0000	1.215
+++ nvidia-kmod.spec	29 Jul 2015 12:20:21 -0000	1.216
@@ -9,7 +9,7 @@
 Epoch:         1
 Version:       352.30
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -17,6 +17,7 @@
 
 Source11:      nvidia-kmodtool-excludekernel-filterfile
 Patch0:        nv-linux-arm.patch
+Patch1:        nv-linux-arm2.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@
 tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
 # patch loop
 %patch0 -p1
+%patch1 -p1
 
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Wed Jul 29 2015 Nicolas Chauvet <kwizart at gmail.com> - 1:352.30-2
+- Fix build on arm - missing linux/swiotlb.h include
+
 * Wed Jul 29 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:352.30-1
 - Update to 352.30