summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2013-08-20 17:20:13 -0700
committerLen Brown <len.brown@intel.com>2014-01-18 22:34:08 -0500
commit2e9c6bc7fb6ffc32d83bc133e4a7389125e8eb0a (patch)
treeca9487a0ffc85dcea608cc4d15e72b1c27756e19 /tools
parentb731f3119de57144e16c19fd593b8daeb637843e (diff)
downloadlinux-2e9c6bc7fb6ffc32d83bc133e4a7389125e8eb0a.tar.gz
linux-2e9c6bc7fb6ffc32d83bc133e4a7389125e8eb0a.tar.bz2
linux-2e9c6bc7fb6ffc32d83bc133e4a7389125e8eb0a.zip
turbostat: Don't attempt to printf an off_t with %zx
turbostat uses the format %zx to print an off_t. However, %zx wants a size_t, not an off_t. On 32-bit targets, those refer to different types, potentially even with different sizes. Use %llx and a cast instead, since printf does not have a length modifier for off_t. Without this patch, when compiling for a 32-bit target: turbostat.c: In function 'get_msr': turbostat.c:231:3: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'off_t' [-Wformat] Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/power/x86/turbostat/turbostat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 93cbef56e876..dbcbf27a4d8b 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -234,7 +234,7 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr)
close(fd);
if (retval != sizeof *msr) {
- fprintf(stderr, "%s offset 0x%zx read failed\n", pathname, offset);
+ fprintf(stderr, "%s offset 0x%llx read failed\n", pathname, (unsigned long long)offset);
return -1;
}