diff options
| author | Michael Pratt <mpratt@google.com> | 2019-01-31 17:47:24 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-01-31 17:49:14 -0800 |
| commit | fe1369ac98a4f1d8af5e8be6da71165339e52034 (patch) | |
| tree | 89c1e4553a375b57e9999278613eb37f104e30a6 /pkg/sentry/mm | |
| parent | 4e695adcd0c739101c3d50431ca18b1b911c9238 (diff) | |
Move package sync to third_party
PiperOrigin-RevId: 231889261
Change-Id: I482f1df055bcedf4edb9fe3fe9b8e9c80085f1a0
Diffstat (limited to 'pkg/sentry/mm')
| -rw-r--r-- | pkg/sentry/mm/BUILD | 2 | ||||
| -rw-r--r-- | pkg/sentry/mm/mm.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/mm/BUILD b/pkg/sentry/mm/BUILD index f679262d0..a85ffdef8 100644 --- a/pkg/sentry/mm/BUILD +++ b/pkg/sentry/mm/BUILD @@ -116,9 +116,9 @@ go_library( "//pkg/sentry/safemem", "//pkg/sentry/usage", "//pkg/sentry/usermem", - "//pkg/sync", "//pkg/syserror", "//pkg/tcpip/buffer", + "//third_party/gvsync", ], ) diff --git a/pkg/sentry/mm/mm.go b/pkg/sentry/mm/mm.go index 2154e7918..a69b8c7be 100644 --- a/pkg/sentry/mm/mm.go +++ b/pkg/sentry/mm/mm.go @@ -42,7 +42,7 @@ import ( "gvisor.googlesource.com/gvisor/pkg/sentry/platform" "gvisor.googlesource.com/gvisor/pkg/sentry/safemem" "gvisor.googlesource.com/gvisor/pkg/sentry/usermem" - ssync "gvisor.googlesource.com/gvisor/pkg/sync" + "gvisor.googlesource.com/gvisor/third_party/gvsync" ) // MemoryManager implements a virtual address space. @@ -84,7 +84,7 @@ type MemoryManager struct { users int32 // mappingMu is analogous to Linux's struct mm_struct::mmap_sem. - mappingMu ssync.DowngradableRWMutex `state:"nosave"` + mappingMu gvsync.DowngradableRWMutex `state:"nosave"` // vmas stores virtual memory areas. Since vmas are stored by value, // clients should usually use vmaIterator.ValuePtr() instead of @@ -121,7 +121,7 @@ type MemoryManager struct { // activeMu is loosely analogous to Linux's struct // mm_struct::page_table_lock. - activeMu ssync.DowngradableRWMutex `state:"nosave"` + activeMu gvsync.DowngradableRWMutex `state:"nosave"` // pmas stores platform mapping areas used to implement vmas. Since pmas // are stored by value, clients should usually use pmaIterator.ValuePtr() |