diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-10-26 10:13:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-10-26 10:13:41 +0200 |
| commit | 6976205051293deb600afbf4c508dbc59e7676de (patch) | |
| tree | adfe2b4674cb43845b2eec1dca7a19ea15ef7a4a | |
| parent | c617996dadf46c7e13205416c84a461f13fd351b (diff) | |
| parent | 45c01771fb4644601bb21b5da82856500e468a3f (diff) | |
| download | nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.tar nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.tar.gz nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.tar.bz2 nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.tar.lz nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.tar.xz nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.tar.zst nixpkgs-6976205051293deb600afbf4c508dbc59e7676de.zip | |
Merge #255683: linux_xanmod*: cleanup extra config
...into staging
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ceb34fe0c76..3c1697e1c08 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -833,6 +833,8 @@ let CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; + FSCACHE_STATS = yes; + DVB_DYNAMIC_MINORS = option yes; # we use udev EFI_STUB = yes; # EFI bootloader in the bzImage itself diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d938f361c85..693fd00fe29 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,6 +2,9 @@ let # These names are how they are designated in https://xanmod.org. + + # NOTE: When updating these, please also take a look at the changes done to + # kernel config in the xanmod version commit ltsVariant = { version = "6.1.57"; hash = "sha256-ZzZj1Ij9L6WtjEJRcOdNtZ18oFRybNPV4uID6umC2Zg="; @@ -26,21 +29,10 @@ let }; structuredExtraConfig = with lib.kernel; { - # AMD P-state driver - X86_AMD_PSTATE = lib.mkOverride 60 yes; - # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; - - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine WINESYNC = module; |