diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-20 15:02:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-20 15:02:51 +0200 |
| commit | 9b00eb8ac2738b27a1469046f2ca76449dcdf04a (patch) | |
| tree | 6a385f0ad652d414fa4e845b86f27a82b63f8928 /tools/lib/api/fs/tracing_path.c | |
| parent | 270b77a0f30e7bc61a9081b86d74dbb62fa6a69d (diff) | |
| parent | 20e8e72d0fa8e26202932c30d592bade73fdc701 (diff) | |
| download | lwn-9b00eb8ac2738b27a1469046f2ca76449dcdf04a.tar.gz lwn-9b00eb8ac2738b27a1469046f2ca76449dcdf04a.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Ingo writes:
"perf fixes:
Misc perf tooling fixes."
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Stop fallbacking to kallsyms for vdso symbols lookup
perf tools: Pass build flags to traceevent build
perf report: Don't crash on invalid inline debug information
perf cpu_map: Align cpu map synthesized events properly.
perf tools: Fix tracing_path_mount proper path
perf tools: Fix use of alternatives to find JDIR
perf evsel: Store ids for events with their own cpus perf_event__synthesize_event_update_cpus
perf vendor events intel: Fix wrong filter_band* values for uncore events
Revert "perf tools: Fix PMU term format max value calculation"
tools headers uapi: Sync kvm.h copy
tools arch uapi: Sync the x86 kvm.h copy
Diffstat (limited to 'tools/lib/api/fs/tracing_path.c')
| -rw-r--r-- | tools/lib/api/fs/tracing_path.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/api/fs/tracing_path.c b/tools/lib/api/fs/tracing_path.c index 120037496f77..5afb11b30fca 100644 --- a/tools/lib/api/fs/tracing_path.c +++ b/tools/lib/api/fs/tracing_path.c @@ -36,7 +36,7 @@ static const char *tracing_path_tracefs_mount(void) __tracing_path_set("", mnt); - return mnt; + return tracing_path; } static const char *tracing_path_debugfs_mount(void) @@ -49,7 +49,7 @@ static const char *tracing_path_debugfs_mount(void) __tracing_path_set("tracing/", mnt); - return mnt; + return tracing_path; } const char *tracing_path_mount(void) |