rpms/nvidia-kmod/devel kernel_v3.10.patch, NONE, 1.1 nvidia-kmod.spec, 1.128, 1.129 buildfix_kernel_3.10.patch, 1.2, NONE
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25787
Modified Files:
nvidia-kmod.spec
Added Files:
kernel_v3.10.patch
Removed Files:
buildfix_kernel_3.10.patch
Log Message:
* Tue Jul 16 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-3
- add better patch for 3.10 kernel
kernel_v3.10.patch:
nv-i2c.c | 9 +++------
nv-procfs.c | 2 ++
2 files changed, 5 insertions(+), 6 deletions(-)
--- NEW FILE kernel_v3.10.patch ---
--- a/kernel/nv-i2c.c
+++ b/kernel/nv-i2c.c
@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
if (!pI2cAdapter) return FALSE;
// attempt release with the OS
- osstatus = i2c_del_adapter(pI2cAdapter);
+ i2c_del_adapter(pI2cAdapter);
- if (!osstatus)
- {
- os_free_mem(pI2cAdapter);
- wasReleased = TRUE;
- }
+ os_free_mem(pI2cAdapter);
+ wasReleased = TRUE;
return wasReleased;
}
--- a/kernel/nv-procfs.c
+++ b/kernel/nv-procfs.c
@@ -14,6 +14,8 @@
#include "os-interface.h"
#include "nv-linux.h"
+#undef CONFIG_PROC_FS
+
#if defined(CONFIG_PROC_FS)
#include "nv_compiler.h"
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- nvidia-kmod.spec 8 Jul 2013 17:05:55 -0000 1.128
+++ nvidia-kmod.spec 16 Jul 2013 16:22:46 -0000 1.129
@@ -9,7 +9,7 @@
Epoch: 1
Version: 325.08
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,7 +24,7 @@
# </switch me>
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: buildfix_kernel_3.10.patch
+Patch0: kernel_v3.10.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,6 +85,9 @@
%changelog
+* Tue Jul 16 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-3
+- add better patch for 3.10 kernel
+
* Mon Jul 08 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-2
- build for current
@@ -294,7 +297,7 @@
* Thu Aug 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.44-1
- Update to 256.44
-* Wed Jun 18 2010 Vallimar de Morieve <vallimar(a)gmail.com> - 1:256.35-1
+* Fri Jun 18 2010 Vallimar de Morieve <vallimar(a)gmail.com> - 1:256.35-1
- update to 256.35
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
@@ -567,7 +570,7 @@
* Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 171.06-2
- Add Patch for 2.6.25rc kernels
-* Fri Mar 8 2008 kwizart < kwizart at gmail.com > - 171.06-1
+* Sat Mar 8 2008 kwizart < kwizart at gmail.com > - 171.06-1
- Update to 171.06 (beta)
* Wed Feb 27 2008 kwizart < kwizart at gmail.com > - 169.12-1
--- buildfix_kernel_3.10.patch DELETED ---