summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-21 19:34:03 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-21 19:34:03 +0000
commit8c2ad2e6183931bf544834ce738d4aa5977d7b2c (patch)
tree359fd7d85a29e2d66b8af4fab8cb14bf81170b5d /pkg/sentry/kernel/shm
parent9569f477d901a82c103646fb5e62a476a1a8a9fc (diff)
parentd72022373f8ab2ca60ec1494858a3cb3e2be9040 (diff)
Merge release-20200914.0-122-gd72022373 (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