diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-09 01:35:55 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-09 01:35:55 +0000 |
| commit | fe97f9816075b6b9ed6537c4cf403bb898f7952a (patch) | |
| tree | 2657ae22c2ea9f57fa6bca5eb55c17c941b13f53 /pkg/sentry/mm | |
| parent | 3b05cf548590cec6acd4f63fe7fdcdb00fba9e79 (diff) | |
| parent | 8d3551da6a41c30fa9c04a5b0cef712c089d5d04 (diff) | |
Merge release-20200818.0-137-g8d3551da6 (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 |