diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-08-27 21:14:42 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-08-27 21:14:42 +0000 |
commit | 20f4dd05f95c911927f0e65b81ff33b33c74ea94 (patch) | |
tree | 7c6a0125a5fd6059dddf20f84b9df9e43786ca3b /pkg/sentry/mm | |
parent | a0256367a5786525eb7a8f4ae48e5fe353208797 (diff) | |
parent | 26c588f06368c21130bb356c6088b76ea715d1ef (diff) |
Merge release-20200818.0-71-g26c588f06 (automated)
Diffstat (limited to 'pkg/sentry/mm')
-rw-r--r-- | pkg/sentry/mm/aio_mappable_refs.go | 2 | ||||
-rw-r--r-- | pkg/sentry/mm/special_mappable_refs.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/mm/aio_mappable_refs.go b/pkg/sentry/mm/aio_mappable_refs.go index ac7690d3f..d4f278400 100644 --- a/pkg/sentry/mm/aio_mappable_refs.go +++ b/pkg/sentry/mm/aio_mappable_refs.go @@ -1,12 +1,12 @@ package mm import ( - "runtime" "sync/atomic" "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" ) // 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 b304fd2ef..2a348bacf 100644 --- a/pkg/sentry/mm/special_mappable_refs.go +++ b/pkg/sentry/mm/special_mappable_refs.go @@ -1,12 +1,12 @@ package mm import ( - "runtime" "sync/atomic" "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" ) // ownerType is used to customize logging. Note that we use a pointer to T so |