summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-29 00:23:35 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-29 00:23:35 +0000
commit433ffad27c0986b847e3b7927b9df33e0f24e38a (patch)
tree33d88d37badb56fabdec60c18d1090022caf59ea /pkg/sentry/kernel/shm
parent493e5248c4af7d4ab10b8874e466bf2a2eeb80d2 (diff)
parentf6ddcbefac8d80d2d00eff90a48bbcd44b041c0f (diff)
Merge release-20200818.0-87-gf6ddcbefa (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 51e07d0b3..35f74eb6c 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"
- "runtime"
"sync/atomic"
+ "fmt"
"gvisor.dev/gvisor/pkg/log"
refs_vfs1 "gvisor.dev/gvisor/pkg/refs"
+ "runtime"
)
// ownerType is used to customize logging. Note that we use a pointer to T so