AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tools/power turbostat: fix various build warnings

Browse Source 
When building with gcc 6 we're getting various build warnings that just
require some trivial function declaration and call fixes:

  turbostat.c: In function ‘dump_cstate_pstate_config_info’:
  turbostat.c:1973:1: warning: type of ‘family’ defaults to ‘int’
   dump_cstate_pstate_config_info(family, model)
  turbostat.c:1973:1: warning: type of ‘model’ defaults to ‘int’
  turbostat.c: In function ‘get_tdp’:
  turbostat.c:2145:8: warning: type of ‘model’ defaults to ‘int’
   double get_tdp(model)
  turbostat.c: In function ‘perf_limit_reasons_probe’:
  turbostat.c:2259:6: warning: type of ‘family’ defaults to ‘int’
   void perf_limit_reasons_probe(family, model)
  turbostat.c:2259:6: warning: type of ‘model’ defaults to ‘int’

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-wbicer8n0s9qe6ql8h9x478e@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Colin Ian King 2016-03-02 13:50:25 +00:00 committed by Arnaldo Carvalho de Melo
parent e17a0e16ca
commit 1b69317d2d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1970,7 +1970,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(unsigned int family, unsigned int model)
{ {
if (!do_nhm_platform_info) if (!do_nhm_platform_info)
return; return;
@ -2142,7 +2142,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(unsigned int model)
{ {
unsigned long long msr; unsigned long long msr;
@ -2256,7 +2256,7 @@ void rapl_probe(unsigned int family, unsigned int model)
return; return;
} }
void perf_limit_reasons_probe(family, model) void perf_limit_reasons_probe(unsigned int family, unsigned int model)
{ {
if (!genuine_intel) if (!genuine_intel)
return; return;
@ -2792,7 +2792,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();