Merge branches 'pm-cpuidle' and 'pm-powercap'

Browse source

Merge cpuidle and power capping changes for 6.11-rc1:

 - Improve the teo cpuidle governor and clean up leftover comments from
   the menu cpuidle governor (Christian Loehle).

 - Clean up a comment typo in the teo cpuidle governor (Atul Kumar
   Pant).

 - Add missing MODULE_DESCRIPTION() macro to cpuidle haltpoll (Jeff
   Johnson).

 - Switch the intel_idle driver to new Intel CPU model defines (Tony
   Luck).

 - Switch the Intel RAPL driver new Intel CPU model defines (Tony Luck).

 - Simplify if condition in the idle_inject driver (Thorsten Blum).

* pm-cpuidle:
  cpuidle: teo: Don't count non-existent intercepts
  cpuidle: teo: Remove recent intercepts metric
  Revert: "cpuidle: teo: Introduce util-awareness"
  cpuidle: governors: teo: Fix a typo in a comment
  cpuidle: haltpoll: add missing MODULE_DESCRIPTION() macro
  cpuidle: menu: Cleanup after loadavg removal
  intel_idle: Switch to new Intel CPU model defines

* pm-powercap:
  powercap: idle_inject: Simplify if condition
  powercap: intel_rapl: Switch to new Intel CPU model defines
  powercap: intel_rapl_msr: Switch to new Intel CPU model defines

...

This commit is contained in:

Rafael J. Wysocki 2024-07-15 18:53:48 +02:00

parent a18abb873b 4b20b07ce7 e5753da31c

commit 7fae6f8b97

7 changed files with 158 additions and 308 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/cpuidle/cpuidle-haltpoll.c

View file

17

drivers/cpuidle/governors/menu.c

View file

194

drivers/cpuidle/governors/teo.c

View file

116

drivers/idle/intel_idle.c

View file

2

drivers/powercap/idle_inject.c

View file

108

drivers/powercap/intel_rapl_common.c

View file

16

drivers/powercap/intel_rapl_msr.c

View file