2013-09-05 14:29:51

by Kyle McMartin

[permalink] [raw]
Subject: [PATCH] perf: builtin-trace.c: check if MAP_32BIT is defined

From: Kyle McMartin <[email protected]>

MAP_32BIT is defined only on x86... this means perf fails to build on
all other platforms.

Signed-off-by: Kyle McMartin <[email protected]>

--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -100,7 +100,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);


2013-09-05 19:26:01

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf: builtin-trace.c: check if MAP_32BIT is defined

Em Thu, Sep 05, 2013 at 10:29:47AM -0400, Kyle McMartin escreveu:
> From: Kyle McMartin <[email protected]>
>
> MAP_32BIT is defined only on x86... this means perf fails to build on
> all other platforms.
>
> Signed-off-by: Kyle McMartin <[email protected]>

Thanks, applying.

- Arnaldo

Subject: [tip:perf/urgent] perf trace: Check if MAP_32BIT is defined

Commit-ID: 41817815666e4a6f302dad1fea47cbe64cc45e40
Gitweb: http://git.kernel.org/tip/41817815666e4a6f302dad1fea47cbe64cc45e40
Author: Kyle McMartin <[email protected]>
AuthorDate: Thu, 5 Sep 2013 10:29:47 -0400
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 5 Sep 2013 16:18:46 -0300

perf trace: Check if MAP_32BIT is defined

MAP_32BIT is defined only on x86... this means perf fails to build on
all other platforms.

Signed-off-by: Kyle McMartin <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Linus Torvalds <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/builtin-trace.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 6016112..f5aa637 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -100,7 +100,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);