BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvidia_x11_legacy304: fix evaluation

Browse source 
nvidia-340.76-kernel-4.0.patch was removed from nvidia_x11_legacy340
54d342add8 but is still needed for 304.

I think. CC @vcunat.
This commit is contained in:
Tobias Geerinckx-Rice 2016-03-06 00:56:53 +01:00
parent 3fc0caf353
commit a90196d4cd
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch Normal file
View file

@ -0,0 +1,28 @@
--- a/kernel/nv-pat.c 2015-07-03 08:39:35.417031728 +0200
+++ b/kernel/nv-pat.c 2015-07-03 08:42:15.631838988 +0200
@@ -35,8 +35,13 @@
unsigned long cr0 = read_cr0();
write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
wbinvd();
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 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 +51,11 @@
wbinvd();
__flush_tlb();
write_cr0((cr0 & 0x9fffffff));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
if (cr4 & 0x80) write_cr4(cr4);
+#else
+ if (cr4 & 0x80) __write_cr4(cr4);
+#endif
}
static int nv_determine_pat_mode(void)