diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 10:04:47 -0400 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 10:41:49 -0400 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /tools/perf/util/trace-event-parse.c | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff) | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
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 fe7a27d67d2b..e9e1c03f927d 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, | |||
| 186 | char *next = NULL; | 186 | char *next = NULL; |
| 187 | char *addr_str; | 187 | char *addr_str; |
| 188 | char *mod; | 188 | char *mod; |
| 189 | char *fmt; | 189 | char *fmt = NULL; |
| 190 | 190 | ||
| 191 | line = strtok_r(file, "\n", &next); | 191 | line = strtok_r(file, "\n", &next); |
| 192 | while (line) { | 192 | while (line) { |