summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-02 18:16:12 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-02 18:16:12 +0000
commit2701844b583df9d1eb41f5918ebf1c46d4af04eb (patch)
treee15cc64e4cb9f9ccd79796175d42114cb7d7f0e6 /pkg/sentry/kernel/shm
parent13513ded54c4efeb7bdc7887ba4ed9cc753440e8 (diff)
parent8ab08cdc01e2e4b36a050ffc3acad682aebaa7b5 (diff)
Merge release-20200818.0-109-g8ab08cdc0 (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 51e07d0b3..0da23fa5f 100644
--- a/pkg/sentry/kernel/shm/shm_refs.go
+++ b/pkg/sentry/kernel/shm/shm_refs.go
@@ -2,11 +2,11 @@ package shm
import (
"fmt"
+ 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