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>
This commit is contained in:
@@ -17,7 +17,7 @@ static pid_t spawn(void)
|
||||
if (pid)
|
||||
return pid;
|
||||
|
||||
while(1);
|
||||
while(1)
|
||||
sleep(5);
|
||||
return 0;
|
||||
}
|
||||
|
@@ -755,11 +755,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
|
||||
nd = browser->curr_hot;
|
||||
break;
|
||||
case K_UNTAB:
|
||||
if (nd != NULL)
|
||||
if (nd != NULL) {
|
||||
nd = rb_next(nd);
|
||||
if (nd == NULL)
|
||||
nd = rb_first(&browser->entries);
|
||||
else
|
||||
} else
|
||||
nd = browser->curr_hot;
|
||||
break;
|
||||
case K_F1:
|
||||
|
@@ -131,6 +131,8 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
|
||||
symlen = unresolved_col_width + 4 + 2;
|
||||
hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
|
||||
symlen);
|
||||
hists__new_col_len(hists, HISTC_MEM_DCACHELINE,
|
||||
symlen);
|
||||
}
|
||||
|
||||
if (h->mem_info->iaddr.sym) {
|
||||
|
@@ -310,7 +310,6 @@ int perf_stat_process_counter(struct perf_stat_config *config,
|
||||
int i, ret;
|
||||
|
||||
aggr->val = aggr->ena = aggr->run = 0;
|
||||
init_stats(ps->res_stats);
|
||||
|
||||
if (counter->per_pkg)
|
||||
zero_per_pkg(counter);
|
||||
|
Reference in New Issue
Block a user