rpms/nvidia-304xx-kmod/devel 3.19_kernel.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.33, 1.34

Leigh Scott leigh123linux at rpmfusion.org
Sat Mar 21 11:36:30 CET 2015


Author: leigh123linux

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

Modified Files:
	nvidia-304xx-kmod.spec 
Added Files:
	3.19_kernel.patch 
Log Message:
* Sat Mar 21 2015 Leigh Scott <leigh123linux at googlemail.com> - 304.125-3
- Patch for 3.19 kernel


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

--- NEW FILE 3.19_kernel.patch ---
--- a/kernel/nv.c	2014-12-02 03:58:34.000000000 +0000
+++ b/kernel/nv.c	2015-03-21 10:28:08.062379864 +0000
@@ -2026,7 +2026,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(
@@ -2035,7 +2039,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-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nvidia-304xx-kmod.spec	21 Mar 2015 09:09:32 -0000	1.33
+++ nvidia-304xx-kmod.spec	21 Mar 2015 10:36:30 -0000	1.34
@@ -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-304xx-kmod
 Version:       304.125
 # Taken over by kmodtool
-Release:       2%{?dist}.2
+Release:       3%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -21,7 +21,8 @@
 Source11:      nvidia-304xx-kmodtool-excludekernel-filterfile
 
 Patch0:        3.18_kernel.patch
-Patch1:        4.0.0_kernel.patch
+Patch1:        3.19_kernel.patch
+Patch2:        4.0.0_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 pushd nvidiapkg-${arch}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 popd
 done
 
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Sat Mar 21 2015 Leigh Scott <leigh123linux at googlemail.com> - 304.125-3
+- Patch for 3.19 kernel
+
 * Sat Mar 21 2015 Nicolas Chauvet <kwizart at gmail.com> - 304.125-2.2
 - Rebuilt for kernel
 


More information about the rpmfusion-commits mailing list