summaryrefslogtreecommitdiff
path: root/runtime/base/mutex.h
diff options
context:
space:
mode:
author David Sehr <sehr@google.com> 2017-02-07 18:00:50 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-02-07 18:00:50 +0000
commitf13eb66a9396b393b84d9fb77381865ad04f260f (patch)
tree25372f908728f17b6c8fc9ea05b20f700fdc8df0 /runtime/base/mutex.h
parent6dde4d32747eb80b67a4b2ab5d38e324dcbc7874 (diff)
parent1b14fb8bc459c3f91ed9fc1ff2e6c011c3d0a0f9 (diff)
Merge "Remove Mutex dependency from MemMap"
Diffstat (limited to 'runtime/base/mutex.h')
-rw-r--r--runtime/base/mutex.h4
1 files changed, 0 insertions, 4 deletions
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_);
};