Merge branch 'perf/urgent' into perf/core, to pick up fixes (a30c99a0) · Commits · e / devices / android_kernel_teracube_2e

tools/perf/builtin-buildid-list.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ int cmd_buildid_list(int argc, const char **argv,
		setup_pager();

		if (show_kernel)
		return sysfs__fprintf_build_id(stdout);
		return !(sysfs__fprintf_build_id(stdout) > 0);

		return perf_session__list_build_ids(force, with_hits);
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,9 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser)
		struct callchain_list *cl = container_of(ms, struct callchain_list, ms);
		bool has_children;

		if (!he \|\| !ms)
		return false;

		if (ms == &he->ms)
		has_children = hist_entry__toggle_fold(he);
		else
		@@ -1189,6 +1192,8 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)
		}

		ui_browser__hists_init_top(browser);
		hb->he_selection = NULL;
		hb->selection = NULL;

		for (nd = browser->top; nd; nd = rb_next(nd)) {
		struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
		@@ -1294,6 +1299,9 @@ static void ui_browser__hists_seek(struct ui_browser *browser,
		* and stop when we printed enough lines to fill the screen.
		*/
		do_offset:
		if (!nd)
		return;

		if (offset > 0) {
		do {
		h = rb_entry(nd, struct hist_entry, rb_node);