summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/shm
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 21:03:27 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 21:03:27 +0000
commit4e151d4db227dfa8b556ce286ae7c8031bb8067b (patch)
tree071f44598349efb83cca3deec27fa27e15f0089c /pkg/sentry/kernel/shm
parent6e8d229edf071293fc1212f191de386f693a9d7b (diff)
parentb8ba0893ec259edfec18db1528bf0a70cc09da02 (diff)
Merge release-20200907.0-149-gb8ba0893e (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