From e2e21ef3208fc1fae6139985304f4e46492ac99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Aug 2015 14:08:01 +0200 Subject: [PATCH] nvidia-x11-legacy{340,304}: fix build with linux-3.18 Close #9218. It's our default kernel (now and for the upcoming release). - 304 won't build with 4.1, - 173 didn't even build with 3.14 due to other issues (3.12 is OK ATM) - all legacy drivers are up-to-date with upstream releases. --- pkgs/os-specific/linux/nvidia-x11/legacy304.nix | 2 ++ .../linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index d5e350a0302a..7f13b6795d47 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { builder = ./builder-legacy304.sh; + patches = [ ./nvidia-340.76-kernel-4.0.patch ]; + src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch index c959190023b7..5fdc1fed7272 100644 --- a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch @@ -4,7 +4,7 @@ unsigned long cr0 = read_cr0(); write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); wbinvd(); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) *cr4 = read_cr4(); if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); +#else @@ -18,7 +18,7 @@ wbinvd(); __flush_tlb(); write_cr0((cr0 & 0x9fffffff)); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) if (cr4 & 0x80) write_cr4(cr4); +#else + if (cr4 & 0x80) __write_cr4(cr4);