commit | 0ab4c5c05f0b38a13d2897dc50143f00811529d1 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Fri Jan 17 00:39:53 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 17 00:39:53 2014 +0000 |
tree | e8ebb25cda441bf2b6453e329c1d19709e68ce51 | |
parent | 6e60cfd6d35ee7dbe68cee1ff2198d3b421ab686 [diff] | |
parent | 0b6b18e707416371f57dd97d7fead4df302155ff [diff] |
Merge "Change lock ordering to prevent violation."
diff --git a/runtime/locks.h b/runtime/locks.h index 9164be6..d4fbd91 100644 --- a/runtime/locks.h +++ b/runtime/locks.h
@@ -51,6 +51,7 @@ kJdwpObjectRegistryLock, kClassLinkerClassesLock, kBreakpointLock, + kMonitorLock, kThreadListLock, kBreakpointInvokeLock, kDeoptimizationLock, @@ -60,7 +61,6 @@ kJdwpAttachLock, kJdwpStartLock, kRuntimeShutdownLock, - kMonitorLock, kHeapBitmapLock, kMutatorLock, kZygoteCreationLock,