summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-21 23:39:17 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-21 23:39:17 +0000
commit19289f4d967517090c20720fea4c687909bdc58f (patch)
tree0050056f9a8941d00ef12f79d74349bba76956f2 /pkg/sentry/kernel/shm
parent7872671b5c52ac770892067c224eb49c6fe0969a (diff)
parent059d90b9f1c52e6aed259ba7ac4847de297273c6 (diff)
Merge release-20200914.0-127-g059d90b9f (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