summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-15 23:02:23 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-15 23:02:23 +0000
commita682447838b5705d2e026e4aa43167b91c694f7e (patch)
tree9c5d7d75ab3e45aa9ce99ab5f8caaea6a9949c2d /pkg/sentry/time
parent86a49b5de9dda0c050584bbaa408be1b68b1fd55 (diff)
parent8b15effd9ec6091feb9ec554ebe38cc02e765560 (diff)
Merge release-20200907.0-53-g8b15effd9 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index f18440378..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 (
- "unsafe"
-
"fmt"
- "gvisor.dev/gvisor/pkg/sync"
"reflect"
"strings"
+ "unsafe"
+
+ "gvisor.dev/gvisor/pkg/sync"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race