diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-27 16:56:00 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-27 16:56:00 +0000 |
| commit | c6791f217421585ddaeabc5611a844f35ea17b01 (patch) | |
| tree | 6ed8870143eadb8c2da5cc55f4cece87fbbe3740 /pkg/sentry/mm | |
| parent | d27124946910f6025ce8f248831e8c356579a6c2 (diff) | |
| parent | 140ffb60073c74953666be476fd0be13301a3b4d (diff) | |
Merge release-20200818.0-67-g140ffb600 (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, 6 insertions, 4 deletions
diff --git a/pkg/sentry/mm/aio_mappable_refs.go b/pkg/sentry/mm/aio_mappable_refs.go index 141747137..ac7690d3f 100644 --- a/pkg/sentry/mm/aio_mappable_refs.go +++ b/pkg/sentry/mm/aio_mappable_refs.go @@ -1,11 +1,12 @@ package mm import ( + "runtime" + "sync/atomic" + "fmt" "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 0921a5d18..b304fd2ef 100644 --- a/pkg/sentry/mm/special_mappable_refs.go +++ b/pkg/sentry/mm/special_mappable_refs.go @@ -1,11 +1,12 @@ package mm import ( + "runtime" + "sync/atomic" + "fmt" "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 |