diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-08-20 19:09:13 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-08-20 19:09:13 +0000 |
| commit | e84af6ab4a7cfe30f558e502fc98f4379b1f9c90 (patch) | |
| tree | ce948c2db6cd078af9aeb90143c848cf3b7bcb28 /pkg/sentry | |
| parent | ebce44714c1b53635a6297dce1c279f4fbee1fa9 (diff) | |
| parent | cf8a689be7fdb539bb789ebd52ce19432776f16d (diff) | |
Merge cf8a689b (automated)
Diffstat (limited to 'pkg/sentry')
| -rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go | 5 | ||||
| -rwxr-xr-x | pkg/sentry/time/seqatomic_parameters_unsafe.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go index 24528b66a..be6b07629 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go @@ -1,12 +1,11 @@ package kernel import ( - "strings" - "unsafe" - "fmt" "gvisor.dev/gvisor/third_party/gvsync" "reflect" + "strings" + "unsafe" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index fb30a22c6..b4fb0a7f0 100755 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,12 +1,11 @@ package time import ( - "strings" - "unsafe" - "fmt" "gvisor.dev/gvisor/third_party/gvsync" "reflect" + "strings" + "unsafe" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |