pyrox.dev / nixpkgs
lol
fork atom

linuxPackages.nvidia_x11_legacy340: fix cr4 references

Patch was copied from here:
https://devtalk.nvidia.com/default/topic/813458/linux-4-0-rc1-346-47-build-error-_cr4-functions-fix/

Reference to kernel change, also noted in the forum post:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/x86/include/asm/paravirt.h?id=1e02ce4cccdcb9688386e5b8d2c9fa4660b45389

Edward Tjörnhammar 6257425d 8e16c574

+30
unified split
+2
pkgs/os-specific/linux/nvidia-x11/legacy340.nix
··· 25 25 26 26 builder = ./builder-legacy340.sh; 27 27 28 + patches = [ ./nvidia-340.76-kernel-4.0.patch ]; 29 + 28 30 src = 29 31 if stdenv.system == "i686-linux" then 30 32 fetchurl {
+28
pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
··· 1 + --- a/kernel/nv-pat.c 2015-07-03 08:39:35.417031728 +0200 2 + +++ b/kernel/nv-pat.c 2015-07-03 08:42:15.631838988 +0200 3 + @@ -35,8 +35,13 @@ 4 + unsigned long cr0 = read_cr0(); 5 + write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); 6 + wbinvd(); 7 + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) 8 + *cr4 = read_cr4(); 9 + if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); 10 + +#else 11 + + *cr4 = __read_cr4(); 12 + + if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); 13 + +#endif 14 + __flush_tlb(); 15 + } 16 + 17 + @@ -46,7 +51,11 @@ 18 + wbinvd(); 19 + __flush_tlb(); 20 + write_cr0((cr0 & 0x9fffffff)); 21 + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) 22 + if (cr4 & 0x80) write_cr4(cr4); 23 + +#else 24 + + if (cr4 & 0x80) __write_cr4(cr4); 25 + +#endif 26 + } 27 + 28 + static int nv_determine_pat_mode(void)