summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-08 19:56:26 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-08 19:56:26 +0000
commit0fcb009a2a3e94302f086de1d17771c28c43e740 (patch)
tree2fd70362a301e4701b49edd86d0a36ed8b3d65e5 /pkg/sentry/time
parent464f14735f396f8ac90e2843362b95ed46133c21 (diff)
parent284e6811e4182d3a40403cf1c8ba8e030468ce61 (diff)
Merge release-20200818.0-131-g284e6811e (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 14978ed91..2cb001080 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,12 @@
package time
import (
+ "fmt"
+ "reflect"
"strings"
"unsafe"
- "fmt"
"gvisor.dev/gvisor/pkg/sync"
- "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race