diff options
| author | Arnaldo Carvalho de Melo <[email protected]> | 2019-08-12 19:25:00 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2019-08-12 19:25:00 +0000 |
| commit | 272172bd418cc32aa466588150c8001bc229c712 (patch) | |
| tree | f529a66933e79ba1f3753e8185112538e861c967 /tools/perf/util/annotate.c | |
| parent | Merge tag 'perf-core-for-mingo-5.4-20190729' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | kernel-272172bd418cc32aa466588150c8001bc229c712.tar.gz kernel-272172bd418cc32aa466588150c8001bc229c712.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To get closer to upstream and check if we need to sync more UAPI
headers, pick up fixes for libbpf that prevent perf's container tests
from completing successfuly, etc.
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 91d4fc3e78cf..e0518dc4c4d2 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1122,7 +1122,7 @@ static int disasm_line__parse(char *line, const char **namep, char **rawp) goto out; (*rawp)[0] = tmp; - *rawp = skip_spaces(*rawp); + *rawp = strim(*rawp); return 0; |