Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/power turbostat: fix GCC9 build regression

Browse Source 
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>
This commit is contained in:
Todd Brandt 2024-07-31 12:24:09 -04:00 committed by Len Brown
parent adc218676e
commit d4a058762f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/power/x86/turbostat/turbostat.c
View File

@ -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) { 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) { switch (ppmt->type) {
case PMT_TYPE_RAW: case PMT_TYPE_RAW:
if (pmt_counter_get_width(ppmt) <= 32) 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; break;
case PMT_TYPE_XTAL_TIME: 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); outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
break; 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) { 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) { switch (ppmt->type) {
case PMT_TYPE_RAW: case PMT_TYPE_RAW:
if (pmt_counter_get_width(ppmt) <= 32) 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; break;
case PMT_TYPE_XTAL_TIME: 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); outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
break; 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) { 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) { switch (ppmt->type) {
case PMT_TYPE_RAW: case PMT_TYPE_RAW:
if (pmt_counter_get_width(ppmt) <= 32) 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; break;
case PMT_TYPE_XTAL_TIME: 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); outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
break; break;
} }