rpms/nvidia-173xx-kmod/F-20 nvidia_3.14_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.72, 1.73 nvidia_3.13_kernel.patch, 1.1, NONE

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-173xx-kmod.spec 
Added Files:
	nvidia_3.14_kernel.patch 
Removed Files:
	nvidia_3.13_kernel.patch 
Log Message:
* Thu Apr 24 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.38-6
- patch for 3.14.0 kernel


nvidia_3.14_kernel.patch:
 nv-linux.h |    3 +++
 nvacpi.c   |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE nvidia_3.14_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);
--- a/usr/src/nv/nv-linux.h
+++ b/usr/src/nv/nv-linux.h
@@ -208,6 +208,9 @@ extern int nv_pat_mode;
 #if defined(CONFIG_ACPI) 
 #include <acpi/acpi.h>
 #include <acpi/acpi_drivers.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
+#include <acpi/acpi_bus.h>
+#endif
 #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
 #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
 #endif


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- nvidia-173xx-kmod.spec	16 Apr 2014 11:40:47 -0000	1.72
+++ nvidia-173xx-kmod.spec	24 Apr 2014 08:32:34 -0000	1.73
@@ -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:       5%{?dist}.12
+Release:       6%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Thu Apr 24 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.38-6
+- patch for 3.14.0 kernel
+
 * Wed Apr 16 2014 Nicolas Chauvet <kwizart at gmail.com> - 173.14.38-5.12
 - Rebuilt for kernel
 


--- nvidia_3.13_kernel.patch DELETED ---