summaryrefslogtreecommitdiffstats
path: root/abs/core/nvidia-304xx/disable-mtrr.patch
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2016-03-01 15:36:49 (GMT)
committerBritney Fransen <brfransen@gmail.com>2016-03-01 15:36:49 (GMT)
commitcb5ff89483c27fb6db94dcff9c1ffb0985c3e13e (patch)
tree4114403737c60be51e3fd5df586a1f7c48b63e58 /abs/core/nvidia-304xx/disable-mtrr.patch
parent48122bf54f33fcf6e5324d181eefdcdc0a6680d1 (diff)
downloadlinhes_pkgbuild-cb5ff89483c27fb6db94dcff9c1ffb0985c3e13e.zip
linhes_pkgbuild-cb5ff89483c27fb6db94dcff9c1ffb0985c3e13e.tar.gz
linhes_pkgbuild-cb5ff89483c27fb6db94dcff9c1ffb0985c3e13e.tar.bz2
nvidia-304xx: rebuild for linux 4.4.3
Diffstat (limited to 'abs/core/nvidia-304xx/disable-mtrr.patch')
-rw-r--r--abs/core/nvidia-304xx/disable-mtrr.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/abs/core/nvidia-304xx/disable-mtrr.patch b/abs/core/nvidia-304xx/disable-mtrr.patch
new file mode 100644
index 0000000..9be9e2c
--- /dev/null
+++ b/abs/core/nvidia-304xx/disable-mtrr.patch
@@ -0,0 +1,24 @@
+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.
+--- a/nv-linux.h
++++ b/nv-linux.h
+@@ -256,6 +256,15 @@
+ #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