rpms/nvidia-173xx-kmod/devel nvidia_3.13_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.53, 1.54

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-173xx-kmod.spec 
Added Files:
	nvidia_3.13_kernel.patch 
Log Message:
* Sun Jan 12 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-2
- patch for 3.13 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/devel/nvidia-173xx-kmod.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nvidia-173xx-kmod.spec	19 Dec 2013 14:58:01 -0000	1.53
+++ nvidia-173xx-kmod.spec	12 Jan 2014 12:30:07 -0000	1.54
@@ -8,7 +8,7 @@
 Name:          nvidia-173xx-kmod
 Version:       173.14.39
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -19,6 +19,8 @@
 
 Source0:       nvidia-kmod-data-%{version}.tar.bz2
 
+Patch0:        nvidia_3.13_kernel.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -45,7 +47,7 @@
 for arch in x86 x64
 do
     pushd nvidiapkg-${arch}
-echo "Nothing to patch"
+%patch0 -p1
     popd
 done
 
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Sun Jan 12 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-2
+- patch for 3.13 kernel
+
 * Thu Dec 19 2013 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-1
 - Update to 173.14.39