summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-09 16:11:36 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-09 16:11:36 +0000
commit41c75d6a7c0963b808c1713a08b962774082584c (patch)
tree462723924cbf6aeac80ef61c89cfe6c3158b0d2f /pkg/sentry/kernel/shm
parentc5ee060bf372e045dd6ce408d26587ade3a8b8f9 (diff)
parent26439f9a43a6a23bd9fbc64f2b43ca843ad25d99 (diff)
Merge release-20200818.0-139-g26439f9a4 (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