diff options
| author | 2015-12-21 23:16:34 +0000 | |
|---|---|---|
| committer | 2015-12-21 23:16:34 +0000 | |
| commit | b05ef624fe26ce48d12ce0fb201087f8d9befecc (patch) | |
| tree | 321498f6e5e6501b591a9a146de75e37bbd7a757 | |
| parent | 50b5b82b7f246c3cdd7dfcd34a3eec1ea5e95262 (diff) | |
| parent | adc183c711731049800d0798ed35a5bc9a681a61 (diff) | |
Merge "Fix lock ordering violation"
am: adc183c711
* commit 'adc183c711731049800d0798ed35a5bc9a681a61':
Fix lock ordering violation
| -rw-r--r-- | runtime/base/mutex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index d4c9057ab3..263f50de51 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -63,6 +63,9 @@ enum LockLevel { kLambdaTableLock, kJdwpSocketLock, kRegionSpaceRegionLock, + kRosAllocGlobalLock, + kRosAllocBracketLock, + kRosAllocBulkFreeLock, kTransactionLogLock, kMarkSweepMarkStackLock, kJniWeakGlobalsLock, @@ -73,9 +76,6 @@ enum LockLevel { kReferenceQueueClearedReferencesLock, kReferenceProcessorLock, kJitCodeCacheLock, - kRosAllocGlobalLock, - kRosAllocBracketLock, - kRosAllocBulkFreeLock, kAllocSpaceLock, kBumpPointerSpaceBlockLock, kArenaPoolLock, |