summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-15 19:15:41 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-15 19:15:41 +0000
commit08bd313149dc0d67781b15742ed064f560897518 (patch)
treea135d25f383e55775ea9beb0f1e51e01e54ba010 /pkg/sentry/kernel/shm
parentf19f2d16c58ef3a3e20344dfb366971724a81eab (diff)
parent84d48c0fddc35e82bf8760acd366509581513274 (diff)
Merge release-20200907.0-46-g84d48c0fd (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
-rw-r--r--pkg/sentry/kernel/shm/shm_refs.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/kernel/shm/shm_refs.go b/pkg/sentry/kernel/shm/shm_refs.go
index 0da23fa5f..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"
- refs_vfs1 "gvisor.dev/gvisor/pkg/refs"
- "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