Commit e76df19b authored by Ingo Molnar's avatar Ingo Molnar

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
...@@ -116,7 +116,7 @@ static const char * const evlist_usage[] = { ...@@ -116,7 +116,7 @@ static const char * const evlist_usage[] = {
int cmd_evlist(int argc, const char **argv, const char *prefix __used) int cmd_evlist(int argc, const char **argv, const char *prefix __used)
{ {
struct perf_attr_details details = { .verbose = false, }; struct perf_attr_details details = { .verbose = false, };
const char *input_name; const char *input_name = NULL;
const struct option options[] = { const struct option options[] = {
OPT_STRING('i', "input", &input_name, "file", OPT_STRING('i', "input", &input_name, "file",
"Input file name"), "Input file name"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment