diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-04 12:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 12:00:55 +0000 |
| commit | 2c3155e94dcc07da0ae6687900b61763d527681d (patch) | |
| tree | f2580dab27781d27b7064ed27dc9d27a5eccce2a /nixos | |
| parent | 5aa2829060a7d98b818724e17c10bf3d74a5f212 (diff) | |
| parent | b4c0c733b32c8b1bbe3ae7f12544947f82986a87 (diff) | |
| download | nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.tar nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.tar.gz nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.tar.bz2 nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.tar.lz nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.tar.xz nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.tar.zst nixlib-2c3155e94dcc07da0ae6687900b61763d527681d.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/throttled.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index 9fa495886119..0f1f00348ee8 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -27,6 +27,7 @@ in { then pkgs.writeText "throttled.conf" cfg.extraConfig else "${pkgs.throttled}/etc/throttled.conf"; + hardware.cpu.x86.msr.enable = true; # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # See https://github.com/erpalma/throttled/issues/215 hardware.cpu.x86.msr.settings.allow-writes = |