diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-21 14:54:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-21 14:54:28 -0400 |
| commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a (patch) | |
| tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 /tools/lib | |
| parent | d92060bc69233a8175a0c2bfa0d2bce123cace2d (diff) | |
| parent | 23469de647c4c7b68b5d135927b1c509f0e757e6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David Ahern's dump indexing bug fix in 'net' overlapped the
change of the function signature of inet6_fill_ifaddr() in
'net-next'. Trivially resolved.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/lib')
| -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) | |||
| 36 | 36 | ||
| 37 | __tracing_path_set("", mnt); | 37 | __tracing_path_set("", mnt); |
| 38 | 38 | ||
| 39 | return mnt; | 39 | return tracing_path; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | static const char *tracing_path_debugfs_mount(void) | 42 | static const char *tracing_path_debugfs_mount(void) |
| @@ -49,7 +49,7 @@ static const char *tracing_path_debugfs_mount(void) | |||
| 49 | 49 | ||
| 50 | __tracing_path_set("tracing/", mnt); | 50 | __tracing_path_set("tracing/", mnt); |
| 51 | 51 | ||
| 52 | return mnt; | 52 | return tracing_path; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | const char *tracing_path_mount(void) | 55 | const char *tracing_path_mount(void) |