diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-09-17 22:41:45 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-09-17 22:41:45 +0000 |
commit | 09fed163e1378e9598053b0e13e254b4757ff0f5 (patch) | |
tree | be211d4ebe6648519d47c1399364bcd82fa47b80 /pkg/sentry/kernel/shm | |
parent | 5902b9f99573f2a64e3759b371aceb8c39f1336c (diff) | |
parent | 319d1b8ba0604e7bc029f98ae0e9b09badd5abad (diff) |
Merge release-20200907.0-129-g319d1b8ba (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r-- | pkg/sentry/kernel/shm/shm_refs.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go index 0da23fa5f..35f74eb6c 100644 --- a/pkg/sentry/kernel/shm/shm_refs.go +++ b/pkg/sentry/kernel/shm/shm_refs.go @@ -1,12 +1,12 @@ package shm import ( - "fmt" - refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "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 |