aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/builtin-probe.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 1347fdf5337e..1c97e133a3f4 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -43,11 +43,12 @@
43#include "util/probe-event.h" 43#include "util/probe-event.h"
44 44
45/* Default vmlinux search paths */ 45/* Default vmlinux search paths */
46#define NR_SEARCH_PATH 3 46#define NR_SEARCH_PATH 4
47const char *default_search_path[NR_SEARCH_PATH] = { 47const char *default_search_path[NR_SEARCH_PATH] = {
48"/lib/modules/%s/build/vmlinux", /* Custom build kernel */ 48"/lib/modules/%s/build/vmlinux", /* Custom build kernel */
49"/usr/lib/debug/lib/modules/%s/vmlinux", /* Red Hat debuginfo */ 49"/usr/lib/debug/lib/modules/%s/vmlinux", /* Red Hat debuginfo */
50"/boot/vmlinux-debug-%s", /* Ubuntu */ 50"/boot/vmlinux-debug-%s", /* Ubuntu */
51"./vmlinux", /* CWD */
51}; 52};
52 53
53#define MAX_PATH_LEN 256 54#define MAX_PATH_LEN 256
@@ -205,13 +206,14 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
205#else /* !NO_LIBDWARF */ 206#else /* !NO_LIBDWARF */
206 pr_debug("Some probes require debuginfo.\n"); 207 pr_debug("Some probes require debuginfo.\n");
207 208
208 if (session.vmlinux) 209 if (session.vmlinux) {
210 pr_debug("Try to open %s.", session.vmlinux);
209 fd = open(session.vmlinux, O_RDONLY); 211 fd = open(session.vmlinux, O_RDONLY);
210 else 212 } else
211 fd = open_default_vmlinux(); 213 fd = open_default_vmlinux();
212 if (fd < 0) { 214 if (fd < 0) {
213 if (session.need_dwarf) 215 if (session.need_dwarf)
214 die("Could not open vmlinux/module file."); 216 die("Could not open debuginfo file.");
215 217
216 pr_debug("Could not open vmlinux/module file." 218 pr_debug("Could not open vmlinux/module file."
217 " Try to use symbols.\n"); 219 " Try to use symbols.\n");