summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-11 09:00:56 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-11 09:00:56 +0000
commitb4312fa7cc07870284ea9dfbc5bcc55cf3617ecb (patch)
tree071ccf3f9b5fdc3edf4199720b05eac0c92bb8cf /pkg/sentry/time
parenta9b8163485d5fab4a27410b4a14d9ec5df5c317c (diff)
parent964447c8ce1ba4f3c7413e90069a045fe0877c2a (diff)
Merge release-20200907.0-31-g964447c8c (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 14978ed91..88d6b5569 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,11 @@
package time
import (
- "strings"
- "unsafe"
-
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
+ "strings"
+ "unsafe"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race