summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-27 03:27:43 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-27 03:27:43 +0000
commitd27124946910f6025ce8f248831e8c356579a6c2 (patch)
tree6ed37bb2e84981b40708a8604e46130b8fb14040 /pkg/sentry/kernel/shm
parent6f5bd2d5be4fe63533bee65ba0fa767a08bc3c3f (diff)
parent32e7a54f7f413ba83af8217b9bc0a367e3c30f94 (diff)
Merge release-20200818.0-66-g32e7a54f7 (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 0da23fa5f..4bffdd0b3 100644
--- a/pkg/sentry/kernel/shm/shm_refs.go
+++ b/pkg/sentry/kernel/shm/shm_refs.go
@@ -2,11 +2,10 @@ 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