diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-26 20:49:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-26 20:49:53 +0200 |
| commit | 474a83b76f6bde8a5f8f8e39d90181ca85d39f46 (patch) | |
| tree | a9f8e2e790b74de50d85469ec79fb1c841c3da90 /tools/perf/util/trace-event-parse.c | |
| parent | 16c21ae5ca636cfd38e581ebcf709c49d78ea56d (diff) | |
| parent | 654fdd041227d7de1594baa61c58f2c87bd0640f (diff) | |
Merge branch 'linus'
Merge in the relevant upstream merge point to queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/trace-event-parse.c')
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index fe7a27d67d2..e9e1c03f927 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -186,7 +186,7 @@ void parse_proc_kallsyms(struct pevent *pevent, char *next = NULL; char *addr_str; char *mod; - char *fmt; + char *fmt = NULL; line = strtok_r(file, "\n", &next); while (line) { |