summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 18:24:16 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 18:24:16 +0000
commit4f22bb9ec7cf0b8137f499f2312222e19d6ba3d1 (patch)
tree7c91b648566b0147bda5044dd3a72287be503ad9 /pkg/sentry/kernel/shm
parent1b75140844fb3973996b52384778fd0567ccf895 (diff)
parentddf37cb19f373ae47836db97349013081cc857b4 (diff)
Merge release-20200907.0-146-gddf37cb19 (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