[arch-commits] Commit in nvidia-304xx/trunk (nvidia-4.0.patch)

[Tobias Powalowski]

    Date: Wednesday, August 12, 2015 @ 07:55:22
  Author: tpowa
Revision: 243198

upgpkg: nvidia-304xx 304.125-23

rebuild against 4.1.5

Added:
  nvidia-304xx/trunk/nvidia-4.0.patch

------------------+
 nvidia-4.0.patch |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

Added: nvidia-4.0.patch
===================================================================
--- nvidia-4.0.patch	                        (rev 0)
+++ nvidia-4.0.patch	2015-08-12 05:55:22 UTC (rev 243198)
@@ -0,0 +1,28 @@
+--- 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)