diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-17 19:04:47 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-17 19:04:47 +0000 |
| commit | c346af254716333f3a5820a720a195c770ae2204 (patch) | |
| tree | 121bf34cd60aa642396c74eb9e468bacdd1d7ebf /pkg/sentry/mm | |
| parent | 992a520782f3a6ad7bb813f91b5a6737c0a2418d (diff) | |
| parent | da07e38f7c986dca568466beea8a0b7db60f09db (diff) | |
Merge release-20200907.0-124-gda07e38f7 (automated)
Diffstat (limited to 'pkg/sentry/mm')
| -rw-r--r-- | pkg/sentry/mm/aio_mappable_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/mm/special_mappable_refs.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkg/sentry/mm/aio_mappable_refs.go b/pkg/sentry/mm/aio_mappable_refs.go index b99909f07..141747137 100644 --- a/pkg/sentry/mm/aio_mappable_refs.go +++ b/pkg/sentry/mm/aio_mappable_refs.go @@ -2,11 +2,10 @@ package mm import ( "fmt" - "runtime" - "sync/atomic" - "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" + "sync/atomic" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/sentry/mm/special_mappable_refs.go b/pkg/sentry/mm/special_mappable_refs.go index 035bbe690..0921a5d18 100644 --- a/pkg/sentry/mm/special_mappable_refs.go +++ b/pkg/sentry/mm/special_mappable_refs.go @@ -2,11 +2,10 @@ package mm import ( "fmt" - "runtime" - "sync/atomic" - "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" + "sync/atomic" ) // ownerType is used to customize logging. Note that we use a pointer to T so |