diff options
author | Aristid Breitkreuz <aristidb@gmail.com> | 2013-09-06 21:46:20 +0200 |
---|---|---|
committer | Aristid Breitkreuz <aristidb@gmail.com> | 2013-09-06 21:46:20 +0200 |
commit | d050dade3ba3b3591b5491a3246d4445b4940be8 (patch) | |
tree | 3575c670a63e09c5d9c536f530782440d190bda3 /pkgs/os-specific/linux | |
parent | bf9b36b616e4a0901d8b5582948db10805f002a4 (diff) |
nvidia for kernel 3.11 fixed
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 455a763c7f0f1..f8413b0e5416b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { patches = [ ./version-test.patch ] + ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch ; src = diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch new file mode 100644 index 0000000000000..bb6fad932e3c1 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch @@ -0,0 +1,25 @@ +From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001 +From: Lukas Elsner <open@mindrunner.de> +Date: Wed, 17 Jul 2013 01:16:04 +0200 +Subject: [PATCH] replace num_physpages with totalram_pages + +--- + kernel/nv-linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h +index 4e5ed89..46c51ec 100644 +--- a/kernel/nv-linux.h ++++ b/kernel/nv-linux.h +@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) + #endif + + #if !defined(NV_VMWARE) +-#define NV_NUM_PHYSPAGES num_physpages ++#define NV_NUM_PHYSPAGES totalram_pages + #define NV_GET_CURRENT_PROCESS() current->tgid + #define NV_IN_ATOMIC() in_atomic() + #define NV_LOCAL_BH_DISABLE() local_bh_disable() +-- +1.8.3.2 + |