]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
tools/power turbostat: fix compiler warnings
authorLen Brown <len.brown@intel.com>
Wed, 24 Feb 2016 23:16:40 +0000 (18:16 -0500)
committerDhaval Giani <dhaval.giani@oracle.com>
Mon, 16 Jan 2017 20:11:08 +0000 (15:11 -0500)
Orabug: 24811361

Signed-off-by: Len Brown <len.brown@intel.com>
(cherry picked from commit 58cc30a4e6086d542302e04eea39b2a438e4c5dd)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
tools/power/x86/turbostat/turbostat.c

Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
tools/power/x86/turbostat/turbostat.c

index ff98b7b4325a8a08032047fc6db6fa4d3140f685..ad5bd56004674fcdc51ad9872df17cd764371fa7 100644 (file)
@@ -1987,7 +1987,7 @@ int has_config_tdp(unsigned int family, unsigned int model)
 }
 
 static void
-dump_cstate_pstate_config_info(unsigned int family, unsigned int model)
+dump_cstate_pstate_config_info(int family, int model)
 {
        if (!do_nhm_platform_info)
                return;
@@ -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_TIME_GRANULARITY   0x3F /* 6 bit time granularity */
 
-double get_tdp(unsigned int model)
+double get_tdp(int model)
 {
        unsigned long long msr;
 
@@ -2364,7 +2364,7 @@ void rapl_probe(unsigned int family, unsigned int model)
        return;
 }
 
-void perf_limit_reasons_probe(unsigned int family, unsigned int model)
+void perf_limit_reasons_probe(int family, int model)
 {
        if (!genuine_intel)
                return;