diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-27 17:51:40 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-27 17:51:40 +0000 |
| commit | 84452958e1397b337a806f815e07ae69c4f4c896 (patch) | |
| tree | 138422671bc14bd0c66f83c31be1a991888f3359 /pkg/sentry/time | |
| parent | bae1520437ecbd3dd217880cb51eb24b59d26f51 (diff) | |
| parent | 0bc022b7f3c13bb7c5c8d47d1781820161e7b1ad (diff) | |
Merge release-20200518.0-45-g0bc022b7 (automated)
Diffstat (limited to 'pkg/sentry/time')
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/time/seqatomic_parameters_unsafe.go | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/time/time_arm64_state_autogen.go | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/time/time_state_autogen.go | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/time/time_unsafe_state_autogen.go | 0 |
4 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index e2c85d862..efd3ccae2 100755..100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,11 +1,11 @@ package time import ( + "fmt" "reflect" "strings" "unsafe" - "fmt" "gvisor.dev/gvisor/pkg/sync" ) diff --git a/pkg/sentry/time/time_arm64_state_autogen.go b/pkg/sentry/time/time_arm64_state_autogen.go index 2adc9c9e0..2adc9c9e0 100755..100644 --- a/pkg/sentry/time/time_arm64_state_autogen.go +++ b/pkg/sentry/time/time_arm64_state_autogen.go diff --git a/pkg/sentry/time/time_state_autogen.go b/pkg/sentry/time/time_state_autogen.go index 2adc9c9e0..2adc9c9e0 100755..100644 --- a/pkg/sentry/time/time_state_autogen.go +++ b/pkg/sentry/time/time_state_autogen.go diff --git a/pkg/sentry/time/time_unsafe_state_autogen.go b/pkg/sentry/time/time_unsafe_state_autogen.go index 2adc9c9e0..2adc9c9e0 100755..100644 --- a/pkg/sentry/time/time_unsafe_state_autogen.go +++ b/pkg/sentry/time/time_unsafe_state_autogen.go |