rpms/nvidia-kmod/devel .cvsignore, 1.61, 1.62 nvidia-kmod.spec, 1.153, 1.154 nvidia_3.14_kernel.patch, 1.2, 1.3 sources, 1.64, 1.65
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18458
Modified Files:
.cvsignore nvidia-kmod.spec nvidia_3.14_kernel.patch sources
Log Message:
* Mon Mar 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.21-1
- Update to 334.21
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore 8 Feb 2014 16:44:36 -0000 1.61
+++ .cvsignore 3 Mar 2014 15:09:28 -0000 1.62
@@ -1 +1 @@
-nvidia-kmod-data-334.16.tar.xz
+nvidia-kmod-data-334.21.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- nvidia-kmod.spec 8 Feb 2014 16:44:36 -0000 1.153
+++ nvidia-kmod.spec 3 Mar 2014 15:09:28 -0000 1.154
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 334.16
+Version: 334.21
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -99,6 +99,9 @@
%changelog
+* Mon Mar 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.21-1
+- Update to 334.21
+
* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-1
- Update to 334.16
- Patch for 3.14 kernel
nvidia_3.14_kernel.patch:
nv-linux.h | 3 +++
uvm/nvidia_uvm_common.c | 4 ++++
2 files changed, 7 insertions(+)
Index: nvidia_3.14_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia_3.14_kernel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia_3.14_kernel.patch 10 Feb 2014 16:05:35 -0000 1.2
+++ nvidia_3.14_kernel.patch 3 Mar 2014 15:09:28 -0000 1.3
@@ -1,27 +1,3 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -15,6 +15,10 @@
- #include "nv-linux.h"
- #include "nv-reg.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
-+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
-+#endif
-+
- #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
- static RM_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32,
NvU32 *);
- static RM_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32,
NvU32 *);
-@@ -303,7 +307,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/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -276,6 +276,9 @@ extern int nv_pat_mode;
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources 8 Feb 2014 16:44:36 -0000 1.64
+++ sources 3 Mar 2014 15:09:28 -0000 1.65
@@ -1 +1 @@
-e353bcf19a1c95307f6d99072d7fc285 nvidia-kmod-data-334.16.tar.xz
+fa4dfdd31d1c0e68af241114e01d11ff nvidia-kmod-data-334.21.tar.xz