summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-17 08:12:49 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-17 08:12:49 +0000
commite7a2420e6f8affb26504eb812331e072cccb25c6 (patch)
treeb74aa748c01f450f3af6c76f095792a4c9566fd1 /pkg/sentry/kernel
parent422a0ed80273a8c08ae28c7b5e754c436fb0d574 (diff)
parenta11061d78a58ed75b10606d1a770b035ed944b66 (diff)
Merge release-20200907.0-121-ga11061d78 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
-rw-r--r--pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go
index 90148bbb2..a0f2fe45c 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"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race