diff options
| author | Ingo Molnar | 2009-10-06 15:02:30 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-10-06 15:02:34 +0200 |
| commit | d9b2002c406011164f245de7a81304625989f1c9 (patch) | |
| tree | a2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /tools/perf/builtin-trace.c | |
| parent | perf report: Use kernel_maps__find_symbol as fallback to find vdsos, etc (diff) | |
| parent | perf_event: Provide vmalloc() based mmap() backing (diff) | |
| download | kernel-qcow2-linux-d9b2002c406011164f245de7a81304625989f1c9.tar.gz kernel-qcow2-linux-d9b2002c406011164f245de7a81304625989f1c9.tar.xz kernel-qcow2-linux-d9b2002c406011164f245de7a81304625989f1c9.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-trace.c')
| -rw-r--r-- | tools/perf/builtin-trace.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 2f938887335a..5d4c84d86373 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -191,10 +191,6 @@ remap: more: event = (event_t *)(buf + head); - size = event->header.size; - if (!size) - size = 8; - if (head + event->header.size >= page_size * mmap_window) { unsigned long shift = page_size * (head / page_size); int res; @@ -209,7 +205,6 @@ more: size = event->header.size; - if (!size || process_event(event, offset, head) < 0) { /* @@ -262,7 +257,6 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) usage_with_options(annotate_usage, options); } - setup_pager(); return __cmd_trace(); |