1 files changed, 5 insertions, 0 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index b6f0725068bd..f5aa6375e3e9 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);
@@ -994,6 +996,9 @@ again:
 
                         handler = evsel->handler.func;
                         handler(trace, evsel, &sample);
+
+                        if (done)
+                                goto out_unmap_evlist;
                 }
         }