summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 17:56:58 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 17:56:58 +0000
commita842a338ecd95a53dad6fae976c11a137d56938f (patch)
tree9ce1a0f883e2aa6d30484f47cccddb7f03468afa /pkg/sentry/kernel/shm
parent3084d4946aaa6c28fb62df129744a69516ab5e13 (diff)
parent30c20df76f969699619bc0819b6e54c9d6bcfb5a (diff)
Merge release-20200818.0-119-g30c20df76 (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