diff options
| author | Brandon Weeks <me@brandonweeks.com> | 2022-03-19 16:04:51 -0700 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-11-22 19:17:51 -0600 |
| commit | 4cfd35418295ad55cbf5f833b6da6c4314d2d46d (patch) | |
| tree | 66938e43082d1b78e79620ae3f7a7012fa6f6785 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | edecccd73c2108206225df1bede853f67faed378 (diff) | |
| download | nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.tar nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.tar.gz nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.tar.bz2 nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.tar.lz nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.tar.xz nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.tar.zst nixpkgs-4cfd35418295ad55cbf5f833b6da6c4314d2d46d.zip | |
linux: fix unused option warnings on 5.x kernels
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fba9f690a2b..606a505885d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -54,7 +54,6 @@ let DEBUG_DEVRES = no; DYNAMIC_DEBUG = yes; DEBUG_STACK_USAGE = no; - DEBUG_STACKOVERFLOW = option no; RCU_TORTURE_TEST = no; SCHEDSTATS = no; DETECT_HUNG_TASK = yes; @@ -400,7 +399,7 @@ let EXT4_FS_POSIX_ACL = yes; EXT4_FS_SECURITY = yes; - EXT4_ENCRYPTION = option yes; + EXT4_ENCRYPTION = whenOlder "5.1" yes; NTFS_FS = whenAtLeast "5.15" no; NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; @@ -426,7 +425,7 @@ let F2FS_FS = module; F2FS_FS_SECURITY = option yes; - F2FS_FS_ENCRYPTION = option yes; + F2FS_FS_ENCRYPTION = whenOlder "5.1" yes; F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; @@ -507,7 +506,7 @@ let MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. - SECURITY_LOCKDOWN_LSM = option no; + SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" no; # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis PERSISTENT_KEYRINGS = yes; @@ -620,10 +619,8 @@ let XEN_PVH = option yes; XEN_PVHVM = option yes; XEN_SAVE_RESTORE = option yes; - XEN_SCRUB_PAGES = option yes; - XEN_SELFBALLOONING = option yes; - XEN_STUB = option yes; - XEN_TMEM = option yes; + XEN_SCRUB_PAGES = whenOlder "4.19" yes; + XEN_SELFBALLOONING = whenOlder "5.3" yes; }; media = { @@ -709,7 +706,8 @@ let LOCK_TORTURE_TEST = option no; MTD_TESTS = option no; NOTIFIER_ERROR_INJECTION = option no; - RCU_PERF_TEST = option no; + RCU_PERF_TEST = whenBetween "4.13" "5.9" no; + RCU_SCALE_TEST = whenAtLeast "5.10" no; RCU_TORTURE_TEST = option no; TEST_ASYNC_DRIVER_PROBE = option no; WW_MUTEX_SELFTEST = option no; |