diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
commit | a2fe194723f6e4990d01d8c208c7b138fd410522 (patch) | |
tree | 7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /tools/perf/util/session.c | |
parent | c3b7cdf180090d2686239a75bb0ae408108ed749 (diff) | |
parent | a018540141a931f5299a866907b27886916b4374 (diff) |
Merge branch 'linus' into perf/core
Pick up the latest ring-buffer fixes, before applying a new fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r-- | tools/perf/util/session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index f5baff1495e6..8e485592ca20 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
@@ -926,7 +926,7 @@ static struct machine * | |||
926 | else | 926 | else |
927 | pid = event->ip.pid; | 927 | pid = event->ip.pid; |
928 | 928 | ||
929 | return perf_session__find_machine(session, pid); | 929 | return perf_session__findnew_machine(session, pid); |
930 | } | 930 | } |
931 | 931 | ||
932 | return perf_session__find_host_machine(session); | 932 | return perf_session__find_host_machine(session); |