On 2/08/2013 4:33 p.m., Jiri Olsa wrote:
The perf compilation fails with following error:
...
CC arch/x86/util/tsc.o
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
Renaming the 'time' variable to prevent this.
Did you see David did the same patch.
Although David noted the gcc version. It doesn't happen for gcc 4.7.3.
The commit message should probably reflect that it depends on the gcc
version.
Otherwise:
Acked-by: Adrian Hunter <[email protected]>
Signed-off-by: Jiri Olsa<[email protected]>
Cc: Arnaldo Carvalho de Melo<[email protected]>
Cc: Corey Ashford<[email protected]>
Cc: Ingo Molnar<[email protected]>
Cc: Paul Mackerras<[email protected]>
Cc: Peter Zijlstra<[email protected]>
Cc: Arnaldo Carvalho de Melo<[email protected]>
Cc: David Ahern<[email protected]>
Cc: Adrian Hunter<[email protected]>
---
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 f111744..9570c2b 100644
--- a/tools/perf/arch/x86/util/tsc.c
+++ b/tools/perf/arch/x86/util/tsc.c
@@ -10,11 +10,11 @@
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
