Commit 9133d582 authored by Len Brown's avatar Len Brown Committed by Tim Gardner

tools/power turbostat: fix compiler warnings

BugLink: http://bugs.launchpad.net/bugs/1591802Signed-off-by: default avatarLen Brown <len.brown@intel.com>
(cherry picked from commit 58cc30a4)
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
Acked-by: default avatarBrad Figg <brad.figg@canonical.com>
Acked-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 0b18e905
...@@ -1987,7 +1987,7 @@ int has_config_tdp(unsigned int family, unsigned int model) ...@@ -1987,7 +1987,7 @@ int has_config_tdp(unsigned int family, unsigned int model)
} }
static void static void
dump_cstate_pstate_config_info(family, model) dump_cstate_pstate_config_info(int family, int model)
{ {
if (!do_nhm_platform_info) if (!do_nhm_platform_info)
return; return;
...@@ -2250,7 +2250,7 @@ int print_perf_limit(struct thread_data *t, struct core_data *c, struct pkg_data ...@@ -2250,7 +2250,7 @@ int print_perf_limit(struct thread_data *t, struct core_data *c, struct pkg_data
#define RAPL_POWER_GRANULARITY 0x7FFF /* 15 bit power granularity */ #define RAPL_POWER_GRANULARITY 0x7FFF /* 15 bit power granularity */
#define RAPL_TIME_GRANULARITY 0x3F /* 6 bit time granularity */ #define RAPL_TIME_GRANULARITY 0x3F /* 6 bit time granularity */
double get_tdp(model) double get_tdp(int model)
{ {
unsigned long long msr; unsigned long long msr;
...@@ -2364,7 +2364,7 @@ void rapl_probe(unsigned int family, unsigned int model) ...@@ -2364,7 +2364,7 @@ void rapl_probe(unsigned int family, unsigned int model)
return; return;
} }
void perf_limit_reasons_probe(family, model) void perf_limit_reasons_probe(int family, int model)
{ {
if (!genuine_intel) if (!genuine_intel)
return; return;
...@@ -2974,7 +2974,7 @@ void process_cpuid() ...@@ -2974,7 +2974,7 @@ void process_cpuid()
perf_limit_reasons_probe(family, model); perf_limit_reasons_probe(family, model);
if (debug) if (debug)
dump_cstate_pstate_config_info(); dump_cstate_pstate_config_info(family, model);
if (has_skl_msrs(family, model)) if (has_skl_msrs(family, model))
calculate_tsc_tweak(); calculate_tsc_tweak();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment