From: Jeroen Roovers <jer@gentoo.org>
Date: Tue, 11 Apr 2017 07:07:04 +0000 (+0200)
Subject: x11-drivers/nvidia-drivers: Fix building without CONFIG_MTRR (bug #614706 by David... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6593722f33f09717f05320e435313c862296fbac;p=gentoo.git

x11-drivers/nvidia-drivers: Fix building without CONFIG_MTRR (bug #614706 by David Flogeras).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch
new file mode 100644
index 000000000000..f902c742b742
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch
@@ -0,0 +1,12 @@
+--- a/kernel/os-agp.c
++++ b/kernel/os-agp.c
+@@ -180,8 +180,8 @@
+     {
+         nv_mtrr_del(nv->agp.arch_phys_wc_add_token, agp_info.aper_base,
+                     agp_info.aper_size << 20);
+-#endif
+     }
++#endif
+ release:
+     NV_AGPGART_BACKEND_RELEASE(drm_agp_p, nvl->agp_bridge);
+ bailout:
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
index f1f1cab7dc55..1946ef0b4059 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
@@ -151,6 +151,8 @@ src_prepare() {
 	# Please add a brief description for every added patch
 
 	if use kernel_linux; then
+		eapply "${FILESDIR}"/${P}-endif.patch
+
 		if kernel_is lt 2 6 9 ; then
 			eerror "You must build this against 2.6.9 or higher kernels."
 		fi