Date: Wednesday, August 12, 2015 @ 07:44:13
Author: tpowa
Revision: 243196
upgpkg: nvidia-304xx 304.125-23
rebuild against 4.1.5
Modified:
nvidia-304xx/trunk/PKGBUILD
Deleted:
nvidia-304xx/trunk/nvidia-4.0.patch
------------------+
PKGBUILD | 2 +-
nvidia-4.0.patch | 28 ----------------------------
2 files changed, 1 insertion(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-08-12 05:11:14 UTC (rev 243195)
+++ PKGBUILD 2015-08-12 05:44:13 UTC (rev 243196)
@@ -6,7 +6,7 @@
pkgname=(nvidia-304xx nvidia-304xx-dkms)
pkgver=304.125
_extramodules=extramodules-4.1-ARCH
-pkgrel=22
+pkgrel=23
arch=('i686' 'x86_64')
url="http://www.nvidia.com/";
makedepends=('libgl' "nvidia-304xx-utils=${pkgver}" 'linux'
'linux-headers>=4.1' 'linux-headers<4.2')
Deleted: nvidia-4.0.patch
===================================================================
--- nvidia-4.0.patch 2015-08-12 05:11:14 UTC (rev 243195)
+++ nvidia-4.0.patch 2015-08-12 05:44:13 UTC (rev 243196)
@@ -1,28 +0,0 @@
---- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800
-+++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800
-@@ -35,8 +35,13 @@
- unsigned long cr0 = read_cr0();
- write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
- wbinvd();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
-+ *cr4 = __read_cr4();
-+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
-+#else
- *cr4 = read_cr4();
- if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
-+#endif
- __flush_tlb();
- }
-
-@@ -46,7 +46,11 @@
- wbinvd();
- __flush_tlb();
- write_cr0((cr0 & 0x9fffffff));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
-+ if (cr4 & 0x80) __write_cr4(cr4);
-+#else
- if (cr4 & 0x80) write_cr4(cr4);
-+#endif
- }
-
- static int nv_determine_pat_mode(void)
