lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core

Browse Source 
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-10-06 15:02:30 +02:00
parent c3b32fcbc7 906010b213
commit d9b2002c40
2420 changed files with 113928 additions and 41277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/builtin-trace.c
View File

@ -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();