diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-16 21:49:24 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-16 21:49:24 +0000 |
| commit | 895d7a71c0fc5215b8b14a2b41b84aa56f2eb9c2 (patch) | |
| tree | 54f6fdf0d0157c9b3e42f27158a626ea6686a602 /pkg/sentry/mm | |
| parent | 81b4980e9ef358a169ea3720ccf65e3e8e2a0f87 (diff) | |
| parent | 3749e70a693007b706fb06529ab95d910a251ba6 (diff) | |
Merge release-20200907.0-65-g3749e70a6 (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 |