rpms/nvidia-304xx-kmod/devel nvidia_3.13_kernel.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.10, 1.11

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-304xx-kmod.spec 
Added Files:
	nvidia_3.13_kernel.patch 
Log Message:
* Mon Dec 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.117-2
- patch for 3.13.0 kernel


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

--- NEW FILE nvidia_3.13_kernel.patch ---
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
@@ -299,7 +299,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-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nvidia-304xx-kmod.spec	14 Dec 2013 17:44:55 -0000	1.10
+++ nvidia-304xx-kmod.spec	24 Dec 2013 20:02:10 -0000	1.11
@@ -8,7 +8,7 @@
 Name:          nvidia-304xx-kmod
 Version:       304.117
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -19,7 +19,7 @@
 Source0:       nvidia-kmod-data-%{version}.tar.xz
 
 Source11:      nvidia-304xx-kmodtool-excludekernel-filterfile
-
+Patch0:        nvidia_3.13_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +46,7 @@
 for arch in x86 x64
 do
 pushd nvidiapkg-${arch}
-echo 'nothing to do' 
+%patch0 -p1
 popd
 done
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Dec 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.117-2
+- patch for 3.13.0 kernel
+
 * Sat Dec 14 2013 Nicolas Chauvet <kwizart at gmail.com> - 304.117-1
 - Update to 304.117