summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-01 21:46:57 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-01 21:46:57 +0000
commitdbd886176ac62b526c81fcda13da63c74d46be98 (patch)
tree95829e05bd49451d8993a7cfcbc07465a13164d2 /pkg/sentry/kernel/shm
parent302245568e5f5286ac6cce38991ea3b9a17a64b7 (diff)
parent2eaf54dd597d8aaa56ad6274e0c1e585d9b9c063 (diff)
Merge release-20200818.0-102-g2eaf54dd5 (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