On 26/07/13 17:27, David Ahern wrote:
> 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 <dsah...@gmail.com>
> Cc: Adrian Hunter <adrian.hun...@intel.com>
Acked-by: Adrian Hunter <adrian.hun...@intel.com>
> ---
> tools/perf/arch/x86/util/tsc.c | 8 ++++----
> 1 file 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
