diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-01 08:31:30 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-01 08:31:30 +0000 |
| commit | 1e30e0a3f34aa20e8bc1c827a2c6db7566540ee8 (patch) | |
| tree | 12afe58ab0dae516b65a50a0aa68192771cd263b /pkg/sentry/mm | |
| parent | 0a7ed3b7d9bafff6c69a1fbdfda36debb9be1697 (diff) | |
| parent | f4be726fde31dac926052b03f5dc666fd4dd4783 (diff) | |
Merge release-20200818.0-97-gf4be726fd (automated)
Diffstat (limited to 'pkg/sentry/mm')
| -rw-r--r-- | pkg/sentry/mm/aio_mappable_refs.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/mm/special_mappable_refs.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/mm/aio_mappable_refs.go b/pkg/sentry/mm/aio_mappable_refs.go index b99909f07..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 ( - "fmt" - "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 035bbe690..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 ( - "fmt" - "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 |