Merge branch 'akpm' (patches from Andrew)

[deliverable/linux.git] / tools / perf / builtin-top.c

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 07fc7921980c053829ec9270e339892714058cfa..bd108683fcb87d30a45bda771f2ad665c59723cf 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -907,7 +907,7 @@ try_again:
 
        if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) {
                ui__error("Failed to mmap with %d (%s)\n",
-                           errno, strerror_r(errno, msg, sizeof(msg)));
+                           errno, str_error_r(errno, msg, sizeof(msg)));
                goto out_err;
        }
 
@@ -1028,7 +1028,7 @@ out_delete:
 
 out_err_cpu_topo: {
        char errbuf[BUFSIZ];
-       const char *err = strerror_r(-ret, errbuf, sizeof(errbuf));
+       const char *err = str_error_r(-ret, errbuf, sizeof(errbuf));
 
        ui__error("Could not read the CPU topology map: %s\n", err);
        goto out_delete;
@@ -1295,7 +1295,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 
        if (perf_evlist__create_maps(top.evlist, target) < 0) {
                ui__error("Couldn't create thread/CPU maps: %s\n",
-                         errno == ENOENT ? "No such process" : strerror_r(errno, errbuf, sizeof(errbuf)));
+                         errno == ENOENT ? "No such process" : str_error_r(errno, errbuf, sizeof(errbuf)));
                goto out_delete_evlist;
        }