summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-02 04:07:02 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-02 04:07:02 +0000
commit0c18ed111c22f59bca103a69bceb632cd0348a54 (patch)
tree1c6d481073caa105b893c16cddcd38a3083218fa /pkg/sentry/kernel/shm
parent2e80f58b0d18b8dd122dc192a1cef9aa6a2da56f (diff)
parent563f28b7d56c11a418856f1defeb64e72beb0e9a (diff)
Merge release-20200818.0-106-g563f28b7d (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