diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-06-11 23:45:10 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-06-11 23:45:10 +0000 |
commit | e72785486d73a34acd7afa3739da17e051690152 (patch) | |
tree | 58ca4722d6e144cdf0a1f7975588df56819b163d /pkg/sentry | |
parent | 7e4557df6c11de78f85d7268212d38cd2b231ed2 (diff) | |
parent | 69c8657a66ac1a7e3bfd388de0a7cd28ac4b51cd (diff) |
Merge 69c8657a (automated)
Diffstat (limited to 'pkg/sentry')
-rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go | 6 | ||||
-rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl.go | 6 | ||||
-rwxr-xr-x | pkg/sentry/time/seqatomic_parameters.go | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go index a5cc41917..5b4ad3062 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go @@ -1,12 +1,12 @@ package kernel import ( - "unsafe" - "fmt" - "gvisor.googlesource.com/gvisor/third_party/gvsync" "reflect" "strings" + "unsafe" + + "gvisor.googlesource.com/gvisor/third_party/gvsync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/platform/ring0/defs_impl.go b/pkg/sentry/platform/ring0/defs_impl.go index 1f48fa176..582553bc7 100755 --- a/pkg/sentry/platform/ring0/defs_impl.go +++ b/pkg/sentry/platform/ring0/defs_impl.go @@ -1,14 +1,14 @@ package ring0 import ( - "gvisor.googlesource.com/gvisor/pkg/cpuid" - "io" - "reflect" "syscall" "fmt" + "gvisor.googlesource.com/gvisor/pkg/cpuid" "gvisor.googlesource.com/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.googlesource.com/gvisor/pkg/sentry/usermem" + "io" + "reflect" ) var ( diff --git a/pkg/sentry/time/seqatomic_parameters.go b/pkg/sentry/time/seqatomic_parameters.go index df73e5c9e..54152a39a 100755 --- a/pkg/sentry/time/seqatomic_parameters.go +++ b/pkg/sentry/time/seqatomic_parameters.go @@ -1,12 +1,12 @@ package time import ( - "unsafe" - "fmt" - "gvisor.googlesource.com/gvisor/third_party/gvsync" "reflect" "strings" + "unsafe" + + "gvisor.googlesource.com/gvisor/third_party/gvsync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |