diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:48:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:48:42 -0500 |
commit | eca9dfcd0029c8a84b1094bb84a2fb53e4addf6c (patch) | |
tree | 2e5982fef1e737ce5f8936981c7dc7fb50fc655c /tools/perf/builtin-probe.c | |
parent | 3981e152864fcc1dbbb564e1f4c0ae11a09639d2 (diff) | |
parent | b5b60fda1e462a849bc37dfbace2888191be82cc (diff) |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf session: Make events_stats u64 to avoid overflow on 32-bit arches
hw-breakpoints: Fix hardware breakpoints -> perf events dependency
perf events: Dont report side-band events on each cpu for per-task-per-cpu events
perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
perf events, x86/stacktrace: Make stack walking optional
perf events: Remove unused perf_counter.h header file
perf probe: Check new event name
kprobe-tracer: Check new event/group name
perf probe: Check whether debugfs path is correct
perf probe: Fix libdwarf include path for Debian
Diffstat (limited to 'tools/perf/builtin-probe.c')
-rw-r--r-- | tools/perf/builtin-probe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 7e741f54d798..c1e6774fd3ed 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include "util/strlist.h" | 38 | #include "util/strlist.h" |
39 | #include "util/event.h" | 39 | #include "util/event.h" |
40 | #include "util/debug.h" | 40 | #include "util/debug.h" |
41 | #include "util/debugfs.h" | ||
41 | #include "util/symbol.h" | 42 | #include "util/symbol.h" |
42 | #include "util/thread.h" | 43 | #include "util/thread.h" |
43 | #include "util/session.h" | 44 | #include "util/session.h" |
@@ -205,6 +206,9 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) | |||
205 | if ((!session.nr_probe && !session.dellist && !session.list_events)) | 206 | if ((!session.nr_probe && !session.dellist && !session.list_events)) |
206 | usage_with_options(probe_usage, options); | 207 | usage_with_options(probe_usage, options); |
207 | 208 | ||
209 | if (debugfs_valid_mountpoint(debugfs_path) < 0) | ||
210 | die("Failed to find debugfs path."); | ||
211 | |||
208 | if (session.list_events) { | 212 | if (session.list_events) { |
209 | if (session.nr_probe != 0 || session.dellist) { | 213 | if (session.nr_probe != 0 || session.dellist) { |
210 | pr_warning(" Error: Don't use --list with" | 214 | pr_warning(" Error: Don't use --list with" |