Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f24645a9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
parents d244b6bd e9184621

tools/perf/util/ui/browsers/annotate.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -146,6 +146,7 @@ static int annotate_browser__run(struct annotate_browser *self, 
		return -1;

		return -1;





	newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);

	newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);

	newtFormAddHotKey(self->b.form, NEWT_KEY_RIGHT);





	nd = self->curr_hot;

	nd = self->curr_hot;

	if (nd) {

	if (nd) {
@@ -178,7 +179,7 @@ static int annotate_browser__run(struct annotate_browser *self, 
	}

	}

out:

out:

	ui_browser__hide(&self->b);

	ui_browser__hide(&self->b);

	return 0;

	return es->u.key;

}

}





int hist_entry__tui_annotate(struct hist_entry *self)

int hist_entry__tui_annotate(struct hist_entry *self)