tools/power turbostat: fix GCC9 build regression

Fix build regression seen when using old gcc-9 compiler.

Signed-off-by: Todd Brandt <todd.e.brandt@intel.com>
Reviewed-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 089220aaa5c9291b5e0432ec1d0fa9b3f44b3e1a..00674f7abdf54cce93f361ad0a09226c7970fdf1 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2788,6 +2788,8 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
        }
 
        for (i = 0, ppmt = sys.pmt_tp; ppmt; i++, ppmt = ppmt->next) {
+               const unsigned long value_raw = t->pmt_counter[i];
+               const double value_converted = 100.0 * value_raw / crystal_hz / interval_float;
                switch (ppmt->type) {
                case PMT_TYPE_RAW:
                        if (pmt_counter_get_width(ppmt) <= 32)
@@ -2799,9 +2801,6 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
                        break;
 
                case PMT_TYPE_XTAL_TIME:
-                       const unsigned long value_raw = t->pmt_counter[i];
-                       const double value_converted = 100.0 * value_raw / crystal_hz / interval_float;
-
                        outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
                        break;
                }
@@ -2869,6 +2868,8 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
        }
 
        for (i = 0, ppmt = sys.pmt_cp; ppmt; i++, ppmt = ppmt->next) {
+               const unsigned long value_raw = c->pmt_counter[i];
+               const double value_converted = 100.0 * value_raw / crystal_hz / interval_float;
                switch (ppmt->type) {
                case PMT_TYPE_RAW:
                        if (pmt_counter_get_width(ppmt) <= 32)
@@ -2880,9 +2881,6 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
                        break;
 
                case PMT_TYPE_XTAL_TIME:
-                       const unsigned long value_raw = c->pmt_counter[i];
-                       const double value_converted = 100.0 * value_raw / crystal_hz / interval_float;
-
                        outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
                        break;
                }
@@ -3068,6 +3066,8 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
        }
 
        for (i = 0, ppmt = sys.pmt_pp; ppmt; i++, ppmt = ppmt->next) {
+               const unsigned long value_raw = p->pmt_counter[i];
+               const double value_converted = 100.0 * value_raw / crystal_hz / interval_float;
                switch (ppmt->type) {
                case PMT_TYPE_RAW:
                        if (pmt_counter_get_width(ppmt) <= 32)
@@ -3079,9 +3079,6 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
                        break;
 
                case PMT_TYPE_XTAL_TIME:
-                       const unsigned long value_raw = p->pmt_counter[i];
-                       const double value_converted = 100.0 * value_raw / crystal_hz / interval_float;
-
                        outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
                        break;
                }