Power management fix for 6.9-rc3

Fix a recent Energy Model change that went against a recent scheduler
 change made independently (Vincent Guittot).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmYQQ1gSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxbY8P/idTjp2C8w++w6o2aMaWLinr0CnUoSPL
 Svw3iPlMIWAIa1TK0KJyQm23T93Ua8iX1Hcli0v1u8dONNv+rR3BGCLaYWkwMsX5
 dH/QP0b6spHGZ6pjrEptkuUCE2XxI0rQ3zQiDEeaux/HnsefQrURH4tfbSNeBYRH
 RbHmYyzDXsjIPL/FJwXN4hHcZX//2XQ/1Z/9posHgxAMfkVbuoGHAGgBsGjjHa+g
 hfgr1nxDpAd0/yCuDCe9+mpoqds+tkvKysEtQVWHfqwQ2HQrD/XuhkMxpCQc2qID
 gZq3E2vMawHcXmmQn6RhuNPwzKKfA/fZUhmcdajHuTLx/kMTrmBT1jTReEsUA+Wn
 utQPoLMxmzJ7l2ZmuWsrKglDc0hHwsXHpCpeNPRw+t/iltX1Z36MuWUcsVaEJa6V
 WdwvXZftxgCbyobwVys/6r8S6auGeuz+NyoPb8KgQbPB1ix/VOKnSLlQCZefhKDF
 bqozE0JC0EAVO09wy5z7OBm7WvbIgOEETs3lbxy+nZ0Eb/jjnzczUVCRQBcmvQCQ
 8RGMhPZBcpMknqH3IFmpIidL0FvAW1eX8MXLA7dDrCz6pc5nVgz0HtucrqiKoypK
 Ytv5tUyqWQtgj+TEWtUNkKDWPIgFQ00P5UlvPL91GOGZLYmF6KOcZGa7IQ1dr44Q
 tyvfb6fUqZbm
 =ZWF8
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2024-04-05 12:55:40 -07:00
commit 2f9fd9e439

View File

@ -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);
/*