summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 17:52:19 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 17:52:19 +0000
commit9948061e71c3779a27fc197f3306692436abcc5a (patch)
treed1cde65b59bfc354e10330aff1d5701ea721c07c /pkg/sentry/kernel/shm
parent7557ec18a717f0a6cc1967706fb718c75388e71e (diff)
parentfcf8d7c6ddac1146cf0d48f833c982cbfb0991e5 (diff)
Merge release-20200907.0-142-gfcf8d7c6d (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