Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[karo-tx-linux.git] / tools / perf / util / map.c

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index c662fef95d1444f243195e90370a7d5e97d06856..4f9a71c63026d185e48807895f0bee39570e8598 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -682,9 +682,16 @@ static int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp
                        continue;
 
                if (verbose >= 2) {
-                       fputs("overlapping maps:\n", fp);
-                       map__fprintf(map, fp);
-                       map__fprintf(pos, fp);
+
+                       if (use_browser) {
+                               pr_warning("overlapping maps in %s "
+                                          "(disable tui for more info)\n",
+                                          map->dso->name);
+                       } else {
+                               fputs("overlapping maps:\n", fp);
+                               map__fprintf(map, fp);
+                               map__fprintf(pos, fp);
+                       }
                }
 
                rb_erase_init(&pos->rb_node, root);
@@ -702,7 +709,7 @@ static int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp
 
                        before->end = map->start;
                        __map_groups__insert(pos->groups, before);
-                       if (verbose >= 2)
+                       if (verbose >= 2 && !use_browser)
                                map__fprintf(before, fp);
                        map__put(before);
                }
@@ -717,7 +724,7 @@ static int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp
 
                        after->start = map->end;
                        __map_groups__insert(pos->groups, after);
-                       if (verbose >= 2)
+                       if (verbose >= 2 && !use_browser)
                                map__fprintf(after, fp);
                        map__put(after);
                }