summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-22 15:44:22 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-22 15:44:22 +0000
commita425892df3749c96c8557546f185358c2f784a66 (patch)
tree09906f2e7ae5017078d516c07e2ba128f1b41f6b /pkg/sentry/kernel/shm
parent9a236b47f4e587d7526cb03bdd41e23b90223e97 (diff)
parentf134f873fc75f941405de7d0e046852a38795bec (diff)
Merge release-20200914.0-129-gf134f873f (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