summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-16 20:51:33 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-16 20:51:33 +0000
commit2cb2cbfc4a6eb66524410a318f603ed5051b04f8 (patch)
tree13cd776e9081f8fd558064cff3008bf67a6b5e9b /pkg/sentry/kernel/shm
parent7647ce91398e073a3a9018cb2639f1e755753eaf (diff)
parent0356c7ef32dfcc05b1f5e7f242a022883a9ba816 (diff)
Merge release-20200907.0-63-g0356c7ef3 (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