summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-26 19:33:46 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-26 19:33:46 +0000
commit821e23d65cde88a75af72b889bf7dfa61a40b3a3 (patch)
tree314f87457d9a364dd6506b27a87ad87a11031efb /pkg/sentry/kernel/shm
parent1e9046264913b0ba4c6232f9063adc81984fef7a (diff)
parent366f1a8f16077da16df6dfdb411f3b7fb2493a0d (diff)
Merge release-20200818.0-60-g366f1a8f1 (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