summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-16 21:21:14 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-16 21:21:14 +0000
commit81b4980e9ef358a169ea3720ccf65e3e8e2a0f87 (patch)
treefbbd99084c6f3a79eedc6c5d8448151dcae58dc0 /pkg/sentry/time
parent2cb2cbfc4a6eb66524410a318f603ed5051b04f8 (diff)
parent666397c5c82ee18a776491919312d19cfe6d4a07 (diff)
Merge release-20200907.0-64-g666397c5c (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 5eb560f57..f18440378 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,12 @@
package time
import (
- "reflect"
- "strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/pkg/sync"
+ "reflect"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race