projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
tools
/
perf
/
builtin-timechart.c
diff --git
a/tools/perf/builtin-timechart.c
b/tools/perf/builtin-timechart.c
index
e50fe11
..
30e5962
100644
(file)
--- a/
tools/perf/builtin-timechart.c
+++ b/
tools/perf/builtin-timechart.c
@@
-61,13
+61,13
@@
struct timechart {
tasks_only,
with_backtrace,
topology;
tasks_only,
with_backtrace,
topology;
+ bool force;
/* IO related settings */
/* IO related settings */
- u64 io_events;
bool io_only,
skip_eagain;
bool io_only,
skip_eagain;
+ u64 io_events;
u64 min_time,
merge_dist;
u64 min_time,
merge_dist;
- bool force;
};
struct per_pidcomm;
};
struct per_pidcomm;
@@
-523,7
+523,7
@@
static const char *cat_backtrace(union perf_event *event,
* Discard all.
*/
zfree(&p);
* Discard all.
*/
zfree(&p);
- goto exit;
+ goto exit
_put
;
}
continue;
}
}
continue;
}
@@
-538,7
+538,8
@@
static const char *cat_backtrace(union perf_event *event,
else
fprintf(f, "..... %016" PRIx64 "\n", ip);
}
else
fprintf(f, "..... %016" PRIx64 "\n", ip);
}
-
+exit_put:
+ addr_location__put(&al);
exit:
fclose(f);
exit:
fclose(f);