1 files changed, 11 insertions, 0 deletions

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 27c2a5efe450..7409ac8de51c 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -316,6 +316,17 @@ static struct thread *__machine__findnew_thread(struct machine *machine,
                 rb_link_node(&th->rb_node, parent, p);
                 rb_insert_color(&th->rb_node, &machine->threads);
                 machine->last_match = th;
+
+                /*
+                 * We have to initialize map_groups separately
+                 * after rb tree is updated.
+                 *
+                 * The reason is that we call machine__findnew_thread
+                 * within thread__init_map_groups to find the thread
+                 * leader and that would screwed the rb tree.
+                 */
+                if (thread__init_map_groups(th, machine))
+                        return NULL;
         }
 
         return th;