Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12420
Modified Files:
nvidia-kmod.spec
Added Files:
3.19_kernel.patch
Log Message:
* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-2
- Patch for 3.19 kernel
3.19_kernel.patch:
nv-frontend.c | 8 ++++++++
nv.c | 4 ++++
2 files changed, 12 insertions(+)
--- NEW FILE 3.19_kernel.patch ---
--- a/kernel/nv-frontend.c 2014-12-02 04:00:01.000000000 +0000
+++ b/kernel/nv-frontend.c 2015-03-31 15:08:42.084974240 +0100
@@ -341,7 +341,11 @@ long nvidia_frontend_unlocked_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
long nvidia_frontend_compat_ioctl(
@@ -350,7 +354,11 @@ long nvidia_frontend_compat_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
int nvidia_frontend_mmap(
--- a/kernel/nv.c 2014-12-02 04:00:00.000000000 +0000
+++ b/kernel/nv.c 2015-03-31 15:11:52.889859631 +0100
@@ -2024,7 +2024,11 @@ nvidia_unlocked_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nvidia_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
/*
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia-kmod.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- nvidia-kmod.spec 30 Mar 2015 07:56:36 -0000 1.219
+++ nvidia-kmod.spec 31 Mar 2015 14:16:18 -0000 1.220
@@ -3,13 +3,13 @@
# "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-kmod
Epoch: 1
Version: 331.113
# Taken over by kmodtool
-Release: 1%{?dist}.8
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -26,6 +26,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Patch0: nv-linux-arm.patch
Patch1: 3.18_kernel.patch
+Patch2: 3.19_kernel.patch
Source11: nvidia-kmodtool-excludekernel-filterfile
@@ -56,6 +57,7 @@
pushd nvidiapkg-${arch}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
popd
done
@@ -99,6 +101,9 @@
%changelog
+* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-2
+- Patch for 3.19 kernel
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.113-1.8
- Rebuilt for kernel
Show replies by thread