From fe1369ac98a4f1d8af5e8be6da71165339e52034 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Thu, 31 Jan 2019 17:47:24 -0800 Subject: Move package sync to third_party PiperOrigin-RevId: 231889261 Change-Id: I482f1df055bcedf4edb9fe3fe9b8e9c80085f1a0 --- pkg/sentry/mm/mm.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/sentry/mm/mm.go') 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() -- cgit v1.2.3