summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-21 19:49:18 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-21 19:49:18 +0000
commitcfe23681046fdf67b4423ecbf797a084802eb1a1 (patch)
tree978c237e75150c5d08b3dd0028f4c0377331c6a3 /pkg/sentry/kernel/shm
parent8c2ad2e6183931bf544834ce738d4aa5977d7b2c (diff)
parenta129204cf508b170a62c93ed7148453f346b32e4 (diff)
Merge release-20200914.0-123-ga129204cf (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 4bffdd0b3..51e07d0b3 100644
--- a/pkg/sentry/kernel/shm/shm_refs.go
+++ b/pkg/sentry/kernel/shm/shm_refs.go
@@ -2,10 +2,11 @@ package shm
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