summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-08 19:53:18 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-08 19:53:18 +0000
commit464f14735f396f8ac90e2843362b95ed46133c21 (patch)
tree7eb3f15d241a80adf402e8fd904830e126598457 /pkg/sentry/kernel/shm
parent41db15c575c283d93c6dd432bc68382e4f4a7928 (diff)
parenta3b87a0cef18d1b0a6e6a0e032fc1fc2c3377dcc (diff)
Merge release-20200818.0-130-ga3b87a0ce (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 4bffdd0b3..51e07d0b3 100644
--- a/pkg/sentry/kernel/shm/shm_refs.go
+++ b/pkg/sentry/kernel/shm/shm_refs.go
@@ -2,10 +2,11 @@ package shm
import (
"fmt"
- "gvisor.dev/gvisor/pkg/log"
- refs_vfs1 "gvisor.dev/gvisor/pkg/refs"
"runtime"
"sync/atomic"
+
+ "gvisor.dev/gvisor/pkg/log"
+ refs_vfs1 "gvisor.dev/gvisor/pkg/refs"
)
// ownerType is used to customize logging. Note that we use a pointer to T so