summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-09 01:35:55 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-09 01:35:55 +0000
commitfe97f9816075b6b9ed6537c4cf403bb898f7952a (patch)
tree2657ae22c2ea9f57fa6bca5eb55c17c941b13f53 /pkg/sentry/kernel/shm
parent3b05cf548590cec6acd4f63fe7fdcdb00fba9e79 (diff)
parent8d3551da6a41c30fa9c04a5b0cef712c089d5d04 (diff)
Merge release-20200818.0-137-g8d3551da6 (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