Commit 2f9fd9e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents b21defcb 8130b05c

include/linux/energy_model.h

+0 −1
Original line number Diff line number Diff line
@@ -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);



	/*