nvidia304: remove disable mtrr patch
This commit is contained in:
parent
83e72dfe40
commit
08d81bd14b
2 changed files with 0 additions and 25 deletions
|
@ -1,24 +0,0 @@
|
||||||
Author: Luca Boccassi <luca.boccassi@gmail.com>
|
|
||||||
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 <linux/seq_file.h>
|
|
||||||
#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 <asm/mtrr.h>
|
|
||||||
#endif
|
|
|
@ -37,7 +37,6 @@ do_extract() {
|
||||||
}
|
}
|
||||||
do_configure() {
|
do_configure() {
|
||||||
cd ${_pkg}
|
cd ${_pkg}
|
||||||
patch -sNp0 -i ${FILESDIR}/disable-mtrr.patch
|
|
||||||
patch -sNp0 -i ${FILESDIR}/drm-driver-legacy.patch
|
patch -sNp0 -i ${FILESDIR}/drm-driver-legacy.patch
|
||||||
patch -sNp0 -i ${FILESDIR}/kernel_4.10.patch
|
patch -sNp0 -i ${FILESDIR}/kernel_4.10.patch
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue