Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1210652

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

Show all headers | View raw

From: Colin Ian King <colin.king@canonical.com>

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@canonical.com>
---
 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] tools/power: turbostat: fix build warnings Colin King <colin.king@canonical.com> - 2015-08-20 19:50 +0200

csiph-web