Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30033 Modified Files: .cvsignore nvidia-kmod.spec sources Added Files: nvidia_3.13_kernel.patch Log Message: * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.38-1 - Update to 331.38 release - Patch for 3.13 kernel nvidia_3.13_kernel.patch: nv-acpi.c | 7 +++++++ 1 file changed, 7 insertions(+) --- NEW FILE nvidia_3.13_kernel.patch --- --- 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); Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 7 Nov 2013 01:18:06 -0000 1.59 +++ .cvsignore 13 Jan 2014 16:05:08 -0000 1.60 @@ -1 +1 @@ -nvidia-kmod-data-331.20.tar.xz +nvidia-kmod-data-331.38.tar.xz Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- nvidia-kmod.spec 15 Dec 2013 12:44:06 -0000 1.147 +++ nvidia-kmod.spec 13 Jan 2014 16:05:08 -0000 1.148 @@ -7,9 +7,9 @@ Name: nvidia-kmod Epoch: 1 -Version: 331.20 +Version: 331.38 # Taken over by kmodtool -Release: 10%{?dist} +Release: 1%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,6 +25,7 @@ Source0: nvidia-kmod-data-%{version}.tar.xz Patch0: nv-linux-arm.patch +Patch1: nvidia_3.13_kernel.patch Source11: nvidia-kmodtool-excludekernel-filterfile @@ -57,6 +58,12 @@ %patch0 -p1 popd done +for arch in x86_64 i686 armv7hl +do +pushd nvidiapkg-${arch} +%patch1 -p1 +popd +done for kernel_version in %{?kernel_versions} ; do @@ -96,6 +103,10 @@ %changelog +* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.38-1 +- Update to 331.38 release +- Patch for 3.13 kernel + * Sun Dec 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:331.20-10 - Fix build with lpae kernel Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 7 Nov 2013 01:18:06 -0000 1.62 +++ sources 13 Jan 2014 16:05:08 -0000 1.63 @@ -1 +1 @@ -55ff14e616146f9d6828a6594bb159d5 nvidia-kmod-data-331.20.tar.xz +9d74494d1d864790a2637ee0ef84074f nvidia-kmod-data-331.38.tar.xz