Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32227 Modified Files: .cvsignore nvidia-kmod.spec sources Added Files: nvidia_3.14_kernel.patch Removed Files: nvidia_3.13_kernel.patch Log Message: * Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:334.16-1 - Update to 334.16 - Patch for 3.14 kernel nvidia_3.14_kernel.patch: nv-acpi.c | 7 +++++++ nv-linux.h | 5 +++++ uvm/nvidia_uvm_common.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE nvidia_3.14_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); --- a/kernel/nv-linux.h +++ b/kernel/nv-linux.h @@ -276,6 +276,11 @@ extern int nv_pat_mode; #if !defined(NV_VMWARE) && 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 --- a/kernel/uvm/nvidia_uvm_common.c +++ b/kernel/uvm/nvidia_uvm_common.c @@ -272,5 +272,5 @@ static void __exit uvm_exit(void) module_init(uvm_init); module_exit(uvm_exit); -MODULE_LICENSE("MIT"); +MODULE_LICENSE("GPL"); MODULE_INFO(supported, "external"); Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 13 Jan 2014 16:05:08 -0000 1.60 +++ .cvsignore 8 Feb 2014 16:44:36 -0000 1.61 @@ -1 +1 @@ -nvidia-kmod-data-331.38.tar.xz +nvidia-kmod-data-334.16.tar.xz Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- nvidia-kmod.spec 25 Jan 2014 10:40:48 -0000 1.152 +++ nvidia-kmod.spec 8 Feb 2014 16:44:36 -0000 1.153 @@ -7,9 +7,9 @@ Name: nvidia-kmod Epoch: 1 -Version: 331.38 +Version: 334.16 # Taken over by kmodtool -Release: 5%{?dist} +Release: 1%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,7 +25,7 @@ Source0: nvidia-kmod-data-%{version}.tar.xz Patch0: nv-linux-arm.patch -Patch1: nvidia_3.13_kernel.patch +Patch1: nvidia_3.14_kernel.patch Source11: nvidia-kmodtool-excludekernel-filterfile @@ -99,6 +99,10 @@ %changelog +* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:334.16-1 +- Update to 334.16 +- Patch for 3.14 kernel + * Sat Jan 25 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:331.38-5 - Disable uvm when NV_BUILD_MODULE_INSTANCES is set - Simplify patch Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 13 Jan 2014 16:05:08 -0000 1.63 +++ sources 8 Feb 2014 16:44:36 -0000 1.64 @@ -1 +1 @@ -9d74494d1d864790a2637ee0ef84074f nvidia-kmod-data-331.38.tar.xz +e353bcf19a1c95307f6d99072d7fc285 nvidia-kmod-data-334.16.tar.xz --- nvidia_3.13_kernel.patch DELETED ---