From 836dcf91c181df6afb0f658bf31d34744f8ff052 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Oct 2015 19:09:51 +0100 Subject: drop splitted x11 drivers, we go gentoo way --- .../nvidia-drivers/files/nvidia-drivers-3.13.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch (limited to 'x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch') diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch deleted file mode 100644 index 69c1ef85..00000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/kernel/nv-acpi.c -+++ b/kernel/nv-acpi.c -@@ -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/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)) -- cgit v1.2.3