Merge branch 'next/drivers' into HEAD

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

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index c643ed669ef94b944ae7d6a850512826cc1d29a4..f14cb5fdb91fb0b3a9c0894367c98570b15f85e6 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -297,8 +297,10 @@ try_again:
                        }
 
                        printf("\n");
-                       error("sys_perf_event_open() syscall returned with %d (%s).  /bin/dmesg may provide additional information.\n",
-                             err, strerror(err));
+                       error("sys_perf_event_open() syscall returned with %d "
+                             "(%s) for event %s. /bin/dmesg may provide "
+                             "additional information.\n",
+                             err, strerror(err), perf_evsel__name(pos));
 
 #if defined(__i386__) || defined(__x86_64__)
                        if (attr->type == PERF_TYPE_HARDWARE &&
@@ -318,7 +320,7 @@ try_again:
                }
        }
 
-       if (perf_evlist__set_filters(evlist)) {
+       if (perf_evlist__apply_filters(evlist)) {
                error("failed to set filter with %d (%s)\n", errno,
                        strerror(errno));
                rc = -1;