diff options
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/mutex.cc | 5 | ||||
| -rw-r--r-- | runtime/base/mutex.h | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index e05a85a116..6e102be1a1 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc @@ -49,7 +49,6 @@ Mutex* Locks::intern_table_lock_ = nullptr; Mutex* Locks::jni_function_table_lock_ = nullptr; Mutex* Locks::jni_libraries_lock_ = nullptr; Mutex* Locks::logging_lock_ = nullptr; -Mutex* Locks::mem_maps_lock_ = nullptr; Mutex* Locks::modify_ldt_lock_ = nullptr; MutatorMutex* Locks::mutator_lock_ = nullptr; Mutex* Locks::profiler_lock_ = nullptr; @@ -1116,10 +1115,6 @@ void Locks::Init() { DCHECK(unexpected_signal_lock_ == nullptr); unexpected_signal_lock_ = new Mutex("unexpected signal lock", current_lock_level, true); - UPDATE_CURRENT_LOCK_LEVEL(kMemMapsLock); - DCHECK(mem_maps_lock_ == nullptr); - mem_maps_lock_ = new Mutex("mem maps lock", current_lock_level); - UPDATE_CURRENT_LOCK_LEVEL(kLoggingLock); DCHECK(logging_lock_ == nullptr); logging_lock_ = new Mutex("logging lock", current_lock_level, true); diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index 21dd437711..ffe18c6a50 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -55,7 +55,6 @@ class Thread; // [1] http://www.drdobbs.com/parallel/use-lock-hierarchies-to-avoid-deadlock/204801163 enum LockLevel { kLoggingLock = 0, - kMemMapsLock, kSwapMutexesLock, kUnexpectedSignalLock, kThreadSuspendCountLock, @@ -712,9 +711,6 @@ class Locks { // One unexpected signal at a time lock. static Mutex* unexpected_signal_lock_ ACQUIRED_AFTER(thread_suspend_count_lock_); - // Guards the maps in mem_map. - static Mutex* mem_maps_lock_ ACQUIRED_AFTER(unexpected_signal_lock_); - // Have an exclusive logging thread. static Mutex* logging_lock_ ACQUIRED_AFTER(unexpected_signal_lock_); }; |