summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-27 23:32:58 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-27 23:32:58 +0000
commit37286e8300205354107bafdf6748f9feed820580 (patch)
tree55ea346062f7af3a5deef23c11d98c0ab8d553fc /pkg/sentry/kernel/shm
parentd0021eca2ad4b9ea932f30dd7229ad337342403d (diff)
parent57877b420caa02bf4c60004c7b434ceef8603b26 (diff)
Merge release-20200818.0-75-g57877b420 (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