summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 03:03:37 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 03:03:37 +0000
commite6486141a9b379f06e841b86d867ef4f09421d3a (patch)
tree5be402dc35fdf8360f474172afa6f4cbd4fa0106 /pkg/sentry/kernel/shm
parente6af9699c8065e6f9f578bdf0213853dcbe07bbd (diff)
parentd34bda027309695e3e6fb6f92a5839cd1f21173e (diff)
Merge release-20200907.0-134-gd34bda027 (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 0da23fa5f..2b4f608c7 100644
--- a/pkg/sentry/kernel/shm/shm_refs.go
+++ b/pkg/sentry/kernel/shm/shm_refs.go
@@ -1,12 +1,12 @@
package shm
import (
- "fmt"
- refs_vfs1 "gvisor.dev/gvisor/pkg/refs"
"runtime"
"sync/atomic"
+ "fmt"
"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