commit f86a0859684c0f8964da4cbe75d49df8f832e85b
author Brian Carlstrom <bdc@google.com> Fri Aug 28 09:07:06 2015 -0700
committer Brian Carlstrom <bdc@google.com> Fri Aug 28 09:07:06 2015 -0700
tree 0e3d972d5dacb92aab5f362f391adfe4e9424262
parent 6010fa93a61088aeb1f312c161f2c19de202a772

Revert "Move mark stack lock up in ordering"

This reverts commit deaa1833e930ab8d8e0011b5267fcc2778a49099.

runtime/base/mutex.h

diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index 6bf203c..5f2caef 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -64,7 +64,6 @@
   kJdwpSocketLock,
   kRegionSpaceRegionLock,
   kTransactionLogLock,
-  kMarkSweepMarkStackLock,
   kJniWeakGlobalsLock,
   kReferenceQueueSoftReferencesLock,
   kReferenceQueuePhantomReferencesLock,
@@ -81,6 +80,7 @@
   kArenaPoolLock,
   kDexFileMethodInlinerLock,
   kDexFileToMethodInlinerMapLock,
+  kMarkSweepMarkStackLock,
   kInternTableLock,
   kOatFileSecondaryLookupLock,
   kTracingUniqueMethodsLock,