diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-01-08 16:31:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-01-08 16:31:19 +0100 |
| commit | 64598e8b6fdaf28e37c3530f8b95a9f8ef6af131 (patch) | |
| tree | f0a85cf0f5234a777ea1d5c7874fb2f27343f912 /tools/perf/util/machine.c | |
| parent | arch: restore generic-y += shmparam.h for some architectures (diff) | |
| parent | perf test shell: Use a fallback to get the pathname in vfs_getname (diff) | |
| download | linux-64598e8b6fdaf28e37c3530f8b95a9f8ef6af131.tar.xz linux-64598e8b6fdaf28e37c3530f8b95a9f8ef6af131.zip | |
Merge tag 'perf-core-for-mingo-4.21-20190104' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
perf annotate:
Ivan Krylov:
- Pass filename to objdump via execl, fixing usage with filenames
with special characters.
perf report:
Jin Yao:
Fix wrong iteration count in --branch-history
perf stat:
Jin Yao:
- Fix endless wait for child process
perf test:
Arnaldo Carvalho de Melo:
- Use a fallback to get the pathname in vfs_getname in
tools build:
Jiri Olsa:
- Allow overriding CFLAGS assignments.
Misc:
Arnaldo Carvalho de Melo:
- Syncronize UAPI headers
Mattias Jacobsson:
- Remove redundant va_end() in strbuf_addv()
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/machine.c')
| -rw-r--r-- | tools/perf/util/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 6fcb3bce0442..143f7057d581 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -2005,7 +2005,7 @@ static void save_iterations(struct iterations *iter, { int i; - iter->nr_loop_iter = nr; + iter->nr_loop_iter++; iter->cycles = 0; for (i = 0; i < nr; i++) |