diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /tools/perf/util/trace-event-parse.c | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 73a02223c62..d8e622dd738 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c | |||
| @@ -153,7 +153,7 @@ void parse_proc_kallsyms(char *file, unsigned int size __unused) | |||
| 153 | char *next = NULL; | 153 | char *next = NULL; |
| 154 | char *addr_str; | 154 | char *addr_str; |
| 155 | char ch; | 155 | char ch; |
| 156 | int ret; | 156 | int ret __used; |
| 157 | int i; | 157 | int i; |
| 158 | 158 | ||
| 159 | line = strtok_r(file, "\n", &next); | 159 | line = strtok_r(file, "\n", &next); |