commit d889178ec78930538d9d6a66c3df9ee9afaffbb4
author Mathieu Chartier <mathieuc@google.com> Sun Mar 02 13:28:37 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Mar 03 17:08:30 2014 -0800
tree 6fa250bdadcdfc1702f57500e618b51df6d46828
parent 06c09f6d79e037ee00113d6289ef98226680797d

Guard entrypoint changing by runtime shutdown lock.

There was a race when we changed the allocation entrypoints where a
new thread would be starting (Thread::Init) and initialize to the
wrong entrypoints. Guarding allocation entrypoint changing
with the runtime shutdown lock fixes this race condition since
Thread::Init is only called with the runtime shutdown lock held.

Bug: 13250963

Change-Id: I8eb209c124b6bf17020de874e1b0083f158b8200

runtime/arch/x86/entrypoints_init_x86.cc

diff --git a/runtime/arch/x86/entrypoints_init_x86.cc b/runtime/arch/x86/entrypoints_init_x86.cc
index 763cbde..c4a7b1b 100644
--- a/runtime/arch/x86/entrypoints_init_x86.cc
+++ b/runtime/arch/x86/entrypoints_init_x86.cc
@@ -15,6 +15,7 @@
  */
 
 #include "entrypoints/portable/portable_entrypoints.h"
+#include "entrypoints/quick/quick_alloc_entrypoints.h"
 #include "entrypoints/quick/quick_entrypoints.h"
 #include "entrypoints/entrypoint_utils.h"