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

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

Merge branch 'perf/core' of... 

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull a 'perf evlist' fix from Arnaldo Carvalho de Melo.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9ba05414 a1d44b9a

tools/perf/builtin-evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static const char * const evlist_usage[] = { 
int cmd_evlist(int argc, const char **argv, const char *prefix __used)

{

	struct perf_attr_details details = { .verbose = false, };

	const char *input_name;

	const char *input_name = NULL;

	const struct option options[] = {

		OPT_STRING('i', "input", &input_name, "file",

			    "Input file name"),