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

Merge branch 'linus' into perf/core

Browse Source 
Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2010-06-28 22:33:13 +02:00
parent 9a15a07fe2 5904b3b81d
commit f384c954c9
268 changed files with 2056 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/util/event.c
View File

@@ -538,8 +538,10 @@ int event__process_task(event_t *self, struct perf_session *session)
dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid,
self->fork.ppid, self->fork.ptid);
if (self->header.type == PERF_RECORD_EXIT)
if (self->header.type == PERF_RECORD_EXIT) {
perf_session__remove_thread(session, thread);
return 0;
}
if (thread == NULL || parent == NULL ||
thread__fork(thread, parent) < 0) {