summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-08 19:56:26 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-08 19:56:26 +0000
commit0fcb009a2a3e94302f086de1d17771c28c43e740 (patch)
tree2fd70362a301e4701b49edd86d0a36ed8b3d65e5 /pkg/sentry/kernel/shm
parent464f14735f396f8ac90e2843362b95ed46133c21 (diff)
parent284e6811e4182d3a40403cf1c8ba8e030468ce61 (diff)
Merge release-20200818.0-131-g284e6811e (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