Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1343 Modified Files: nvidia-kmod.spec nvidia_3.13_kernel.patch Log Message: * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.38-3 - fix patch for 3.13 kernel Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- nvidia-kmod.spec 13 Jan 2014 16:16:07 -0000 1.149 +++ nvidia-kmod.spec 13 Jan 2014 17:37:48 -0000 1.150 @@ -9,7 +9,7 @@ Epoch: 1 Version: 331.38 # 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 @@ -103,6 +103,9 @@ %changelog +* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.38-3 +- fix patch for 3.13 kernel + * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.38-2 - rebuild for akmod nvidia_3.13_kernel.patch: nv-acpi.c | 7 +++++++ uvm/nvidia_uvm_linux.h | 10 ++++++++-- 2 files changed, 15 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nvidia_3.13_kernel.patch 13 Jan 2014 16:05:08 -0000 1.1 +++ nvidia_3.13_kernel.patch 13 Jan 2014 17:37:48 -0000 1.2 @@ -22,3 +22,25 @@ // remove event notifier status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); +--- a/kernel/uvm/nvidia_uvm_linux.h ++++ b/kernel/uvm/nvidia_uvm_linux.h +@@ -405,11 +405,17 @@ typedef void irqreturn_t; + // not require the RCU's read lock on current->cred. + // + // ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) ++#define NV_KUID_TO_UID(value) (__kuid_val(value)) ++#else ++#define NV_KUID_TO_UID(value) (value) ++#endif ++ + #if defined(NV_TASK_STRUCT_HAS_CRED) + #define NV_CURRENT_EUID() \ +- (((typeof(*current->cred) __force __kernel *)current->cred)->euid) ++ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid) + #else +-#define NV_CURRENT_EUID() (current->euid) ++#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid) + #endif + + #define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val))