summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 01:24:50 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 01:24:50 +0000
commitba2b04392c3b72ce9684564f57c59a6a88c8c8a7 (patch)
treee2da6f22c92cc382ad072e1e81e3003c66bb8efd /pkg/sentry/kernel
parent2aae647465e5d427ca3d427049310d3b26e796f0 (diff)
parentb69352245ab729cc01088c8258a3167f069bd684 (diff)
Merge release-20200818.0-115-gb69352245 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
-rw-r--r--pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go
index 90148bbb2..8a2418c41 100644
--- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go
+++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go
@@ -1,12 +1,12 @@
package kernel
import (
- "fmt"
- "reflect"
"strings"
"unsafe"
+ "fmt"
"gvisor.dev/gvisor/pkg/sync"
+ "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race