summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-02 22:46:16 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-02 22:46:16 +0000
commit73bc5a700f9d4a4df8cc4c543fdb65915b14a337 (patch)
tree63ff4f749f076cac1d8591baf04bd340c0e5cf6a /pkg/sentry/time
parent0d6a229627e9f8128136f005d30bc5c2d0d0423b (diff)
parent0ca0d8e0110d284120497569dca1b85d3ec227fe (diff)
Merge release-20200818.0-113-g0ca0d8e01 (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