diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-04-14 18:37:19 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-04-14 18:37:19 +0000 |
| commit | ca506c33c1f00c4e57f640340178007a813d3454 (patch) | |
| tree | 52ef7111534dd020c5d026c3acc026769b863ecf /pkg/sentry/time | |
| parent | 3a197f66df7303d3bc89e89beeed02f22debda98 (diff) | |
| parent | 5c1052b6bb2658208f1afaf423aeac98f30235c1 (diff) | |
Merge release-20210408.0-30-g5c1052b6b (automated)
Diffstat (limited to 'pkg/sentry/time')
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index e57055fc7..357e476ec 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -3,6 +3,7 @@ package time import ( "unsafe" + "gvisor.dev/gvisor/pkg/gohacks" "gvisor.dev/gvisor/pkg/sync" ) @@ -27,7 +28,7 @@ func SeqAtomicLoadParameters(seq *sync.SeqCount, ptr *Parameters) Parameters { func SeqAtomicTryLoadParameters(seq *sync.SeqCount, epoch sync.SeqCountEpoch, ptr *Parameters) (val Parameters, ok bool) { if sync.RaceEnabled { - sync.Memmove(unsafe.Pointer(&val), unsafe.Pointer(ptr), unsafe.Sizeof(val)) + gohacks.Memmove(unsafe.Pointer(&val), unsafe.Pointer(ptr), unsafe.Sizeof(val)) } else { val = *ptr |