[PATCH] tools/power: turbostat: fix build warnings

From: Colin King
Date: Thu Aug 20 2015 - 13:47:31 EST


From: Colin Ian King <colin.king@xxxxxxxxxxxxx>

We're getting build warnings because of poorly defined function
declarations:

turbostat.c: In function âdump_cstate_pstate_config_infoâ:
turbostat.c:1877:1: warning: type of âfamilyâ defaults to âintâ [-Wimplicit-int]
dump_cstate_pstate_config_info(family, model)
^
turbostat.c:1877:1: warning: type of âmodelâ defaults to âintâ [-Wimplicit-int]
turbostat.c: In function âget_tdpâ:
turbostat.c:2046:8: warning: type of âmodelâ defaults to âintâ [-Wimplicit-int]
double get_tdp(model)
^
turbostat.c: In function âperf_limit_reasons_probeâ:
turbostat.c:2160:6: warning: type of âfamilyâ defaults to âintâ [-Wimplicit-int]
void perf_limit_reasons_probe(family, model)
^
turbostat.c:2160:6: warning: type of âmodelâ defaults to âintâ [-Wimplicit-int]

Minor changes to correct these build warnings.

Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
---
tools/power/x86/turbostat/turbostat.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 323b65e..01673ca 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1874,7 +1874,7 @@ int has_knl_turbo_ratio_limit(unsigned int family, unsigned int model)
}
}
static void
-dump_cstate_pstate_config_info(family, model)
+dump_cstate_pstate_config_info(unsigned int family, unsigned int model)
{
if (!do_nhm_platform_info)
return;
@@ -2043,7 +2043,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_TIME_GRANULARITY 0x3F /* 6 bit time granularity */

-double get_tdp(model)
+double get_tdp(unsigned int model)
{
unsigned long long msr;

@@ -2157,7 +2157,7 @@ void rapl_probe(unsigned int family, unsigned int model)
return;
}

-void perf_limit_reasons_probe(family, model)
+void perf_limit_reasons_probe(unsigned int family, unsigned int model)
{
if (!genuine_intel)
return;
@@ -2684,7 +2684,7 @@ void process_cpuid()
perf_limit_reasons_probe(family, model);

if (debug)
- dump_cstate_pstate_config_info();
+ dump_cstate_pstate_config_info(family, model);

return;
}
--
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/