diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 11:43:00 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 11:43:00 -0400 |
| commit | e3c55d406bd8df1a878546002c93db90c42be10c (patch) | |
| tree | efb0ba2707c95fd7166cf1b76887c43c977e37dd /tools/perf/builtin-lock.c | |
| parent | 4d6e482675f13e33599fc3d18fc723959be0a9b6 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were
committed through other trees.
Diffstat (limited to 'tools/perf/builtin-lock.c')
| -rw-r--r-- | tools/perf/builtin-lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 76543a4a7a30..ee33ba2f05dd 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c | |||
| @@ -805,7 +805,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, | |||
| 805 | struct perf_evsel *evsel, | 805 | struct perf_evsel *evsel, |
| 806 | struct machine *machine) | 806 | struct machine *machine) |
| 807 | { | 807 | { |
| 808 | struct thread *thread = machine__findnew_thread(machine, sample->tid); | 808 | struct thread *thread = machine__findnew_thread(machine, sample->pid, |
| 809 | sample->tid); | ||
| 809 | 810 | ||
| 810 | if (thread == NULL) { | 811 | if (thread == NULL) { |
| 811 | pr_debug("problem processing %d event, skipping it.\n", | 812 | pr_debug("problem processing %d event, skipping it.\n", |