summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-17 19:14:53 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-17 19:14:53 +0000
commit63e009e612887c2cc2143aefecdf430acf19562e (patch)
tree5cb0c83e563c0b90a46d57f12102474895b7b5ca /pkg/sentry/kernel/shm
parent5ecebda34332d0368794efe3f4e30e4fbbe523a0 (diff)
parentd796b100ecfe529e350575655b972400c52390d7 (diff)
Merge release-20200907.0-125-gd796b100e (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