Commit d4a05876 authored by Todd Brandt's avatar Todd Brandt Committed by Len Brown
Browse files

tools/power turbostat: fix GCC9 build regression 



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

Signed-off-by: default avatarTodd Brandt <todd.e.brandt@intel.com>
Reviewed-by: default avatarChen Yu <yu.c.chen@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent adc21867

tools/power/x86/turbostat/turbostat.c

+6 −9
Original line number Diff line number Diff line
@@ -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;

		}