diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-01-30 09:15:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-30 09:15:49 +0100 |
| commit | 28fb8a5b6e233fc384fb27f9f91f811b40ba9cf8 (patch) | |
| tree | 6239311b9d3bf0fc1b62e8abe27a460a3959b458 /tools/perf/arch/x86/tests/intel-cqm.c | |
| parent | perf: Remove/simplify lockdep annotation (diff) | |
| parent | perf stat: Do not clean event's private stats (diff) | |
| download | linux-dev-28fb8a5b6e233fc384fb27f9f91f811b40ba9cf8.tar.xz linux-dev-28fb8a5b6e233fc384fb27f9f91f811b40ba9cf8.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Fix 'perf stat' stddev reporting due to mistakenly cleaning event
private stats (Jiri Olsa)
- Fix 'perf test CQM' endless loop detected by 'gcc6 -Wmisleading-indentation'
(Markus Trippelsdorf)
- Fix behaviour of Shift-Tab when nothing is focussed in the annotate TUI browser,
detected with gcc6 -Wmisleading-indentation (Markus Trippelsdorf)
- Fix mem data cacheline hists browser width setting for unresolved
addresses (Jiri Olsa)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch/x86/tests/intel-cqm.c')
| -rw-r--r-- | tools/perf/arch/x86/tests/intel-cqm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c index 3e89ba825f6b..7f064eb37158 100644 --- a/tools/perf/arch/x86/tests/intel-cqm.c +++ b/tools/perf/arch/x86/tests/intel-cqm.c @@ -17,7 +17,7 @@ static pid_t spawn(void) if (pid) return pid; - while(1); + while(1) sleep(5); return 0; } |