Merge tag 'v4.19-rc5' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined tools/perf/util/map.c
index 3f07a587c8e6a67b5a5423e06ea8267f4f8c8ced,6a6929f208b4da042eeece3006f9c53740002289..354e54550d2b58efc422a23ebc24e21f9d2e6e9b
--- 1/tools/perf/util/map.c
--- 2/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@@ -320,11 -320,12 +320,11 @@@ int map__load(struct map *map
                        build_id__sprintf(map->dso->build_id,
                                          sizeof(map->dso->build_id),
                                          sbuild_id);
 -                      pr_warning("%s with build id %s not found",
 -                                 name, sbuild_id);
 +                      pr_debug("%s with build id %s not found", name, sbuild_id);
                } else
 -                      pr_warning("Failed to open %s", name);
 +                      pr_debug("Failed to open %s", name);
  
 -              pr_warning(", continuing without symbols\n");
 +              pr_debug(", continuing without symbols\n");
                return -1;
        } else if (nr == 0) {
  #ifdef HAVE_LIBELF_SUPPORT
@@@ -333,11 -334,12 +333,11 @@@
  
                if (len > sizeof(DSO__DELETED) &&
                    strcmp(name + real_len + 1, DSO__DELETED) == 0) {
 -                      pr_warning("%.*s was updated (is prelink enabled?). "
 +                      pr_debug("%.*s was updated (is prelink enabled?). "
                                "Restart the long running apps that use it!\n",
                                   (int)real_len, name);
                } else {
 -                      pr_warning("no symbols found in %s, maybe install "
 -                                 "a debug package?\n", name);
 +                      pr_debug("no symbols found in %s, maybe install a debug package?\n", name);
                }
  #endif
                return -1;
@@@ -574,6 -576,13 +574,13 @@@ struct symbol *map_groups__find_symbol(
        return NULL;
  }
  
+ static bool map__contains_symbol(struct map *map, struct symbol *sym)
+ {
+       u64 ip = map->unmap_ip(map, sym->start);
+ 
+       return ip >= map->start && ip < map->end;
+ }
+ 
  struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,
                                         struct map **mapp)
  {
@@@ -589,6 -598,10 +596,10 @@@
  
                if (sym == NULL)
                        continue;
+               if (!map__contains_symbol(pos, sym)) {
+                       sym = NULL;
+                       continue;
+               }
                if (mapp != NULL)
                        *mapp = pos;
                goto out;
@@@ -699,7 -712,8 +710,7 @@@ static int maps__fixup_overlappings(str
                if (verbose >= 2) {
  
                        if (use_browser) {
 -                              pr_warning("overlapping maps in %s "
 -                                         "(disable tui for more info)\n",
 +                              pr_debug("overlapping maps in %s (disable tui for more info)\n",
                                           map->dso->name);
                        } else {
                                fputs("overlapping maps:\n", fp);