Em Thu, Dec 15, 2016 at 08:56:54PM +0100, Jiri Olsa escreveu:
> There might be systems where MAP_32BIT is not defined,
> like some some RHEL7 powerpc versions.
>
> Signed-off-by: Jiri Olsa <[email protected]>
> Cc: Kyle McMartin <[email protected]>
> Cc: David Ahern <[email protected]>
> Cc: Namhyung Kim <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Fixes: 277cf08f3feb ("perf trace beauty mmap: Fix defines for non !x86_64")
Ouch, so we need what was removed in:
Fixes: 256763b01741 ("perf trace beauty mmap: Add more conditional defines")
I.e. the ifdef at the switch case entry, not the removal of the
conditional definition expecting that it would be available in the arch
header, as in some cases those are not there. So I'm replacing the Fixme
cset, ok?
Thanks for taking the time to fill in that tag, appreciated!
Also this all needs a revamp to support cross 'perf trace'ing, i.e.
collecting a file on arch A and doing 'perf trace -i perf.data' on a
different machine with a CPU fo a different arch, where either per arch
beautifiers are needed or a dynamic switch, i.e. the value for some
define is different between archs....
Patch applied, thanks,
- Arnaldo
> Link: http://lkml.kernel.org/n/[email protected]
> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
> ---
> tools/perf/trace/beauty/mmap.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c
> index fd710ab33684..af1cfde6b97b 100644
> --- a/tools/perf/trace/beauty/mmap.c
> +++ b/tools/perf/trace/beauty/mmap.c
> @@ -42,7 +42,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf,
> size_t size,
>
> P_MMAP_FLAG(SHARED);
> P_MMAP_FLAG(PRIVATE);
> +#ifdef MAP_32BIT
> P_MMAP_FLAG(32BIT);
> +#endif
> P_MMAP_FLAG(ANONYMOUS);
> P_MMAP_FLAG(DENYWRITE);
> P_MMAP_FLAG(EXECUTABLE);
> --
> 2.7.4
