linux-kernel - Re: [PATCH] perf tools: Renaming 'time' variable in perf_time_to

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <51FD5899.6060100@intel.com>
Date:	Sat, 03 Aug 2013 22:23:05 +0300
From:	Adrian Hunter <adrian.hunter@...el.com>
To:	Jiri Olsa <jolsa@...hat.com>
CC:	linux-kernel@...r.kernel.org,
	Corey Ashford <cjashfor@...ux.vnet.ibm.com>,
	Ingo Molnar <mingo@...e.hu>, Paul Mackerras <paulus@...ba.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Arnaldo Carvalho de Melo <acme@...hat.com>,
	David Ahern <dsahern@...il.com>
Subject: Re: [PATCH] perf tools: Renaming 'time' variable in perf_time_to_tsc
 due to name shadowing error

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 <adrian.hunter@...el.com>


>
> Signed-off-by: Jiri Olsa<jolsa@...hat.com>
> Cc: Arnaldo Carvalho de Melo<acme@...hat.com>
> Cc: Corey Ashford<cjashfor@...ux.vnet.ibm.com>
> Cc: Ingo Molnar<mingo@...e.hu>
> Cc: Paul Mackerras<paulus@...ba.org>
> Cc: Peter Zijlstra<a.p.zijlstra@...llo.nl>
> Cc: Arnaldo Carvalho de Melo<acme@...hat.com>
> Cc: David Ahern<dsahern@...il.com>
> Cc: Adrian Hunter<adrian.hunter@...el.com>
> ---
>   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 majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/