diff --git a/srcpkgs/nvidia304/files/disable-mtrr.patch b/srcpkgs/nvidia304/files/disable-mtrr.patch deleted file mode 100644 index 280acab0421..00000000000 --- a/srcpkgs/nvidia304/files/disable-mtrr.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Luca Boccassi -Description: Disable MTRR on kernel >= 4.3 - From kernel 4.3 and newer (commit 2baa891e42d84) mtrr_add and mtrr_del are no - longer exported. The Nvidia kernel shim still uses it as of 304.131, causing - the module to error out when loading. Disable MTRR if running on 4.3 or greater - until upstream fixes it. ---- kernel/nv-linux.h -+++ kernel/nv-linux.h -@@ -254,6 +254,15 @@ RM_STATUS nvos_forward_error_to_cray(struct pci_dev *, NvU32, - #include - #endif - -+/* -+ * As of version 304.131, os-agp.c and os-mtrr.c still use deprecated -+ * kernel APIs for mtrr which are no longer exported since 4.3, causing -+ * the module to error out when loaded. -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+#undef CONFIG_MTRR -+#endif -+ - #if !defined(NV_VMWARE) && defined(CONFIG_MTRR) - #include - #endif diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index ceffe053fc4..fac94728311 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -37,7 +37,6 @@ do_extract() { } do_configure() { cd ${_pkg} - patch -sNp0 -i ${FILESDIR}/disable-mtrr.patch patch -sNp0 -i ${FILESDIR}/drm-driver-legacy.patch patch -sNp0 -i ${FILESDIR}/kernel_4.10.patch }