rpms/nvidia-304xx-kmod/devel nvidia-304xx-kmod.spec, 1.12, 1.13 nvidia_3.13_kernel.patch, 1.1, 1.2
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14039
Modified Files:
nvidia-304xx-kmod.spec nvidia_3.13_kernel.patch
Log Message:
* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
- fix 3.13.0 kernel patch for EFI systems with CSM disabled
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nvidia-304xx-kmod.spec 24 Dec 2013 20:03:00 -0000 1.12
+++ nvidia-304xx-kmod.spec 13 Jan 2014 11:07:03 -0000 1.13
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.117
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
+- fix 3.13.0 kernel patch for EFI systems with CSM disabled
+
* Mon Dec 23 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-2
- patch for 3.13.0 kernel
nvidia_3.13_kernel.patch:
nv-acpi.c | 7 +++++++
1 file changed, 7 insertions(+)
Index: nvidia_3.13_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia_3.13_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia_3.13_kernel.patch 24 Dec 2013 20:02:10 -0000 1.1
+++ nvidia_3.13_kernel.patch 13 Jan 2014 11:07:03 -0000 1.2
@@ -1,5 +1,16 @@
--- 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 int nv_acpi_add (struct acpi_device *);
@@ -299,7 +299,10 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)