rpms/nvidia-173xx-kmod/F-20 nvidia_3.19_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.118, 1.119

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12675

Modified Files:
	nvidia-173xx-kmod.spec 
Added Files:
	nvidia_3.19_kernel.patch 
Log Message:
* Tue Mar 31 2015 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-5
- patch for 3.19 kernel


nvidia_3.19_kernel.patch:
 nv.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE nvidia_3.19_kernel.patch ---
--- a/usr/src/nv/nv.c	2013-11-27 22:47:09.000000000 +0000
+++ b/usr/src/nv/nv.c	2015-03-31 15:22:33.326267641 +0100
@@ -2746,7 +2746,11 @@ long nv_kern_unlocked_ioctl(
     unsigned long i_arg
 )
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
     return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
 }
 
 long nv_kern_compat_ioctl(
@@ -2755,7 +2759,11 @@ long nv_kern_compat_ioctl(
     unsigned long i_arg
 )
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
     return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
 }
 
 /*


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- nvidia-173xx-kmod.spec	30 Mar 2015 07:56:15 -0000	1.118
+++ nvidia-173xx-kmod.spec	31 Mar 2015 14:28:40 -0000	1.119
@@ -3,12 +3,12 @@
 # "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 newest
+%global buildforkernels current
 
 Name:          nvidia-173xx-kmod
 Version:       173.14.39
 # Taken over by kmodtool
-Release:       4%{?dist}.12
+Release:       5%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -19,6 +19,7 @@
 
 Source0:       nvidia-kmod-data-%{version}.tar.bz2
 Patch0:        nvidia_3.17_kernel.patch
+Patch1:        nvidia_3.19_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +48,7 @@
 do
     pushd nvidiapkg-${arch}
 %patch0 -p1
+%patch1 -p1
     popd
 done
 
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Tue Mar 31 2015 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-5
+- patch for 3.19 kernel
+
 * Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 173.14.39-4.12
 - Rebuilt for kernel