diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-08 21:04:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-08 21:04:32 +0000 |
| commit | 71e560ec44aadbe9675b0eebbc4b54634a52919a (patch) | |
| tree | 6356dc845c3b763509a6c9616d8d5b42a6cccd4d /pkg/sentry/mm | |
| parent | 0fcb009a2a3e94302f086de1d17771c28c43e740 (diff) | |
| parent | c8f1ce288dd4d600ec191ef6cefcb02e2d6599ab (diff) | |
Merge release-20200818.0-132-gc8f1ce288 (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..b99909f07 100644 --- a/pkg/sentry/mm/aio_mappable_refs.go +++ b/pkg/sentry/mm/aio_mappable_refs.go @@ -2,10 +2,11 @@ package mm import ( "fmt" - "gvisor.dev/gvisor/pkg/log" - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" "runtime" "sync/atomic" + + "gvisor.dev/gvisor/pkg/log" + refs_vfs1 "gvisor.dev/gvisor/pkg/refs" ) // 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..035bbe690 100644 --- a/pkg/sentry/mm/special_mappable_refs.go +++ b/pkg/sentry/mm/special_mappable_refs.go @@ -2,10 +2,11 @@ package mm import ( "fmt" - "gvisor.dev/gvisor/pkg/log" - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" "runtime" "sync/atomic" + + "gvisor.dev/gvisor/pkg/log" + refs_vfs1 "gvisor.dev/gvisor/pkg/refs" ) // ownerType is used to customize logging. Note that we use a pointer to T so |