perf tools: Fix compile of util/tsc.c
authorDavid Ahern <dsahern@gmail.com>
Fri, 26 Jul 2013 14:27:23 +0000 (08:27 -0600)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 7 Aug 2013 20:35:24 +0000 (17:35 -0300)
On Fedora 18, with gcc 4.6.4 compile fails with:

arch/x86/util/tsc.c: In function ‘perf_time_to_tsc’:
arch/x86/util/tsc.c:13:6: error: declaration of ‘time’ shadows a global declaration [-Werror=shadow]
cc1: all warnings being treated as errors
make: *** [/tmp/junk/arch/x86/util/tsc.o] Error 1
make: *** Waiting for unfinished jobs....

Fix by renaming the local variable.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Link: http://lkml.kernel.org/r/1374848843-43127-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/arch/x86/util/tsc.c

index f111744..9570c2b 100644 (file)
 
 u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc)
 {
-       u64 time, quot, rem;
+       u64 t, quot, rem;
 
-       time = ns - tc->time_zero;
-       quot = time / tc->time_mult;
-       rem  = time % tc->time_mult;
+       t = ns - tc->time_zero;
+       quot = t / tc->time_mult;
+       rem  = t % tc->time_mult;
        return (quot << tc->time_shift) +
               (rem << tc->time_shift) / tc->time_mult;
 }