summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-24 12:28:14 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-24 12:28:14 +0200
commite76df19bd986656e3c9f4a62e3dd15e7d69b607a (patch)
tree760cb29f2a89ed0627a28be313f42170b8d2ab55 /tools
parent9ba0541453b3a57797701b9fbc0fd8d0be173050 (diff)
parenta1d44b9acdf7b2820ef762846150b4d13b84e075 (diff)
downloadlinux-3.10-e76df19bd986656e3c9f4a62e3dd15e7d69b607a.tar.gz
linux-3.10-e76df19bd986656e3c9f4a62e3dd15e7d69b607a.tar.bz2
linux-3.10-e76df19bd986656e3c9f4a62e3dd15e7d69b607a.zip
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-evlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c
index e52d77ec708..acd78dc2834 100644
--- a/tools/perf/builtin-evlist.c
+++ b/tools/perf/builtin-evlist.c
@@ -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"),