diff options
author | David Ahern <dsahern@gmail.com> | 2013-07-26 10:27:23 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-08-07 16:35:24 -0400 |
commit | 602bab1b883090ffd125ed1253fe8ec127c048b1 (patch) | |
tree | 24d97c01ad4efdd17ec0304e1ee66f25ad5ea737 | |
parent | 251f426fddd9217ce6e4478653d3ee33df518030 (diff) |
perf tools: Fix compile of util/tsc.c
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>
-rw-r--r-- | tools/perf/arch/x86/util/tsc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c index f1117441cdcd..9570c2b0f83c 100644 --- a/tools/perf/arch/x86/util/tsc.c +++ b/tools/perf/arch/x86/util/tsc.c | |||
@@ -10,11 +10,11 @@ | |||
10 | 10 | ||
11 | u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc) | 11 | u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc) |
12 | { | 12 | { |
13 | u64 time, quot, rem; | 13 | u64 t, quot, rem; |
14 | 14 | ||
15 | time = ns - tc->time_zero; | 15 | t = ns - tc->time_zero; |
16 | quot = time / tc->time_mult; | 16 | quot = t / tc->time_mult; |
17 | rem = time % tc->time_mult; | 17 | rem = t % tc->time_mult; |
18 | return (quot << tc->time_shift) + | 18 | return (quot << tc->time_shift) + |
19 | (rem << tc->time_shift) / tc->time_mult; | 19 | (rem << tc->time_shift) / tc->time_mult; |
20 | } | 20 | } |