rpms/nvidia-304xx-kmod/F-20 3.19_kernel.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.73, 1.74
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12961
Modified Files:
nvidia-304xx-kmod.spec
Added Files:
3.19_kernel.patch
Log Message:
* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 304.123-2
- 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
@@ -2014,7 +2014,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(
@@ -2023,7 +2027,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/F-20/nvidia-304xx-kmod.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- nvidia-304xx-kmod.spec 30 Mar 2015 07:56:22 -0000 1.73
+++ nvidia-304xx-kmod.spec 31 Mar 2015 14:41:36 -0000 1.74
@@ -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.123
# Taken over by kmodtool
-Release: 1%{?dist}.30
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@
#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
Source0: nvidia-kmod-data-%{version}.tar.xz
+Patch0: 3.19_kernel.patch
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
@@ -45,7 +46,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- echo 'no patch'
+%patch0 -p1
popd
done
@@ -79,6 +80,9 @@
%changelog
+* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 304.123-2
+- Patch for 3.19 kernel
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 304.123-1.30
- Rebuilt for kernel