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