rpms/nvidia-kmod/devel nvidia-kmod.spec, 1.150, 1.151 nvidia_3.13_kernel.patch, 1.2, 1.3
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3693
Modified Files:
nvidia-kmod.spec nvidia_3.13_kernel.patch
Log Message:
* Tue Jan 21 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-4
- make more changes to 3.13 kernel patch
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- nvidia-kmod.spec 13 Jan 2014 17:37:48 -0000 1.150
+++ nvidia-kmod.spec 21 Jan 2014 21:02:13 -0000 1.151
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.38
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -103,6 +103,9 @@
%changelog
+* Tue Jan 21 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-4
+- make more changes to 3.13 kernel patch
+
* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-3
- fix patch for 3.13 kernel
nvidia_3.13_kernel.patch:
nv-acpi.c | 3 +++
uvm/nvidia_uvm_linux.h | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
Index: nvidia_3.13_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia_3.13_kernel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia_3.13_kernel.patch 13 Jan 2014 17:37:48 -0000 1.2
+++ nvidia_3.13_kernel.patch 21 Jan 2014 21:02:13 -0000 1.3
@@ -1,16 +1,5 @@
--- 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)