summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-28 00:00:45 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-28 00:00:45 +0000
commit5df75d5fa6e9ded2ab19b56473f4baebef48edbd (patch)
treeac6d532a63a15a0e28c4779c4a4dbfde2673ff91 /pkg/sentry/kernel/shm
parentb110c6e52b1e9043fed0604a9037156bce6ca746 (diff)
parent84f04909c2c3a55b209f01315493e6850160d707 (diff)
Merge release-20200818.0-77-g84f04909c (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