diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /tools/perf/util/trace-event-parse.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
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) { |