rpms/nvidia-173xx-kmod/F-19 nvidia_3.14_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.97, 1.98 nvidia_3.13_kernel.patch, 1.1, NONE
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5581
Modified Files:
nvidia-173xx-kmod.spec
Added Files:
nvidia_3.14_kernel.patch
Removed Files:
nvidia_3.13_kernel.patch
Log Message:
* Tue May 20 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-3
- 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-19/nvidia-173xx-kmod.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- nvidia-173xx-kmod.spec 15 May 2014 06:07:12 -0000 1.97
+++ nvidia-173xx-kmod.spec 20 May 2014 09:14:30 -0000 1.98
@@ -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: 2%{?dist}.12
+Release: 3%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,7 +18,7 @@
#
http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
Source0: nvidia-kmod-data-%{version}.tar.bz2
-Patch0: nvidia_3.13_kernel.patch
+Patch0: nvidia_3.14_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -90,6 +90,9 @@
%changelog
+* Tue May 20 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-3
+- patch for 3.14.0 kernel
+
* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-2.12
- Rebuilt for kernel
--- nvidia_3.13_kernel.patch DELETED ---