rpms/nvidia-173xx-kmod/F-20 nvidia_3.13_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.59, 1.60

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-173xx-kmod.spec 
Added Files:
	nvidia_3.13_kernel.patch 
Log Message:
* Wed Feb 12 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.38-5
- patch for 3.13.0 kernel


nvidia_3.13_kernel.patch:
 nvacpi.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE nvidia_3.13_kernel.patch ---
--- a/usr/src/nv/nvacpi.c
+++ b/usr/src/nv/nvacpi.c
@@ -259,7 +259,10 @@ static int nv_acpi_remove(struct acpi_de
 
     if (pNvAcpiObject->notify_handler_installed)
     {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+#endif
 
         // remove event notifier
         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- nvidia-173xx-kmod.spec	7 Feb 2014 13:04:43 -0000	1.59
+++ nvidia-173xx-kmod.spec	12 Feb 2014 12:10:27 -0000	1.60
@@ -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.38
 # Taken over by kmodtool
-Release:       4%{?dist}.7
+Release:       5%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -18,6 +18,7 @@
 # http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
 
 Source0:       nvidia-kmod-data-%{version}.tar.bz2
+Patch0:        nvidia_3.13_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,7 +46,7 @@
 for arch in x86 x64
 do
     pushd nvidiapkg-${arch}
-echo "Nothing to patch"
+%patch0 -p1
     popd
 done
 
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Wed Feb 12 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.38-5
+- patch for 3.13.0 kernel
+
 * Fri Feb 07 2014 Nicolas Chauvet <kwizart at gmail.com> - 173.14.38-4.7
 - Rebuilt for kernel