diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-02-18 14:43:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 14:43:29 +0100 |
| commit | 968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b (patch) | |
| tree | 01d5ad1b5ff2c6c468895057ab606afefe8c281a /pkgs/os-specific | |
| parent | 05b0e49fd94918b515b7462648326466eb944a46 (diff) | |
| parent | 4c73c02917f0fb65cb89b5df79d645280783d1f3 (diff) | |
| download | nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.tar nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.tar.gz nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.tar.bz2 nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.tar.lz nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.tar.xz nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.tar.zst nixpkgs-968d7e80c7ffb6ecd970a5dd63d3a2e00f33939b.zip | |
Merge pull request #113236 from blitz/kcmp
linux: enable kcmp() system call
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 730b25a406f..11e318bd140 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -643,7 +643,12 @@ let XZ_DEC_TEST = option no; }; - criu = optionalAttrs (features.criu or false) ({ + criu = if (versionAtLeast version "4.19") then { + # Unconditionally enabled, because it is required for CRIU and + # it provides the kcmp() system call that Mesa depends on. + CHECKPOINT_RESTORE = yes; + } else optionalAttrs (features.criu or false) ({ + # For older kernels, CHECKPOINT_RESTORE is hidden behind EXPERT. EXPERT = yes; CHECKPOINT_RESTORE = yes; } // optionalAttrs (features.criu_revert_expert or true) { |