diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-05 12:55:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-05 12:55:40 -0700 |
| commit | 2f9fd9e439706c615b77c23d70184ddefa7fb9e0 (patch) | |
| tree | 5c95884329ff31c98205fc6e0e5a149386ceace3 /include/linux | |
| parent | b21defcb52c67c5580ddba8b9823820bccccf97e (diff) | |
| parent | 8130b05c559d1aa83d0c8971b422ba0da18ef24a (diff) | |
Merge tag 'pm-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a recent Energy Model change that went against a recent scheduler
change made independently (Vincent Guittot)"
* tag 'pm-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: EM: fix wrong utilization estimation in em_cpu_energy()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/energy_model.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h index 770755df852f..70cd7258cd29 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -245,7 +245,6 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd, * max utilization to the allowed CPU capacity before calculating * effective performance. */ - max_util = map_util_perf(max_util); max_util = min(max_util, allowed_cpu_cap); /* |