summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-01 18:15:36 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-01 18:15:36 +0000
commitf5181c6067ad420d16557d21734453994fb42791 (patch)
tree58e768fc08664c0dd37b69bf5bfff42cb88ca7c9 /pkg/sentry/kernel/shm
parent964da19b9b3361162209ad820eab7a957d10bc20 (diff)
parent71589b7f7e69b85820c9deb75fc6d0b6c5f00eb1 (diff)
Merge release-20200818.0-99-g71589b7f7 (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 4bffdd0b3..0da23fa5f 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"
)
// ownerType is used to customize logging. Note that we use a pointer to T so