diff options
| author | Florian Klink <flokli@flokli.de> | 2020-12-29 01:28:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 01:28:09 +0100 |
| commit | 316862f72b192e0c222daf84438426f889e19294 (patch) | |
| tree | 1b34f50dd45cc94e04c17012f0dd22d9b33f3f95 /nixos/modules/services/hardware | |
| parent | 226de73de7d833c265dcdb1162deb2dbb3fc6497 (diff) | |
| parent | e07f4d6795413d98a2b871d5a8e03d6a9bd16e0f (diff) | |
| download | nixpkgs-316862f72b192e0c222daf84438426f889e19294.tar nixpkgs-316862f72b192e0c222daf84438426f889e19294.tar.gz nixpkgs-316862f72b192e0c222daf84438426f889e19294.tar.bz2 nixpkgs-316862f72b192e0c222daf84438426f889e19294.tar.lz nixpkgs-316862f72b192e0c222daf84438426f889e19294.tar.xz nixpkgs-316862f72b192e0c222daf84438426f889e19294.tar.zst nixpkgs-316862f72b192e0c222daf84438426f889e19294.zip | |
Merge pull request #102106 from tadfisher/throttled-msr-warning
nixos/throttled: disable kernel msr warning
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/throttled.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index 7617c4492d7..1905eb565c6 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -26,5 +26,11 @@ in { if cfg.extraConfig != "" then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig else "${pkgs.throttled}/etc/lenovo_fix.conf"; + + # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. + # See https://github.com/erpalma/throttled/issues/215 + boot.kernelParams = + optional (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") + "msr.allow_writes=on"; }; } |