Merge tag 'linux-kselftest-kunit-5.15-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / kernel / power / energy_model.c

diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index 0f4530b..a332ccd 100644 (file)
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -170,7 +170,9 @@ static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd,
        /* Compute the cost of each performance state. */
        fmax = (u64) table[nr_states - 1].frequency;
        for (i = 0; i < nr_states; i++) {
-               table[i].cost = div64_u64(fmax * table[i].power,
+               unsigned long power_res = em_scale_power(table[i].power);
+
+               table[i].cost = div64_u64(fmax * power_res,
                                          table[i].frequency);
        }