summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-26 21:45:46 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-26 21:45:46 +0000
commit7670835ddf34078801e6e9cba1dc02b3d76d1318 (patch)
tree9e069fb5db1735ef313c3c9faf977b9a35b295ce /pkg/sentry/kernel/shm
parent821e23d65cde88a75af72b889bf7dfa61a40b3a3 (diff)
parent983a55aa0649e48467b2e41f9550759535634854 (diff)
Merge release-20200818.0-61-g983a55aa0 (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 51e07d0b3..4bffdd0b3 100644
--- a/pkg/sentry/kernel/shm/shm_refs.go
+++ b/pkg/sentry/kernel/shm/shm_refs.go
@@ -2,11 +2,10 @@ package shm
import (
"fmt"
- "runtime"
- "sync/atomic"
-
"gvisor.dev/gvisor/pkg/log"
refs_vfs1 "gvisor.dev/gvisor/pkg/refs"
+ "runtime"
+ "sync/atomic"
)
// ownerType is used to customize logging. Note that we use a pointer to T so