summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-23 00:59:55 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-23 00:59:55 +0000
commit43ee43819bf4f2e433065def7908aa57f493f5a7 (patch)
tree87659ee64420e96ff3789ffb9d8ee71b8587df1d /pkg/sentry/kernel/shm
parent3b2f12d245c6973479d5286e87355f33bada6c0f (diff)
parentc0f21bb19a0ff0fd4bc3bd1f0bed9171e43faf68 (diff)
Merge release-20200914.0-135-gc0f21bb19 (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