diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-09-23 21:12:10 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-09-23 21:12:10 +0000 |
| commit | a7232056d6e7b6a823927b6d0338ac765b42ca7b (patch) | |
| tree | 2cdb5f06175a53546776b715a160404fd7ab1b0b /pkg/sentry/kernel/futex | |
| parent | 275222631a31e1cc29a02776bae47631229df191 (diff) | |
| parent | 93ac1557751a0c17a85f49d715b96833acf39dc6 (diff) | |
Merge release-20210921.0-25-g93ac15577 (automated)
Diffstat (limited to 'pkg/sentry/kernel/futex')
| -rw-r--r-- | pkg/sentry/kernel/futex/atomicptr_bucket_unsafe.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/futex/atomicptr_bucket_unsafe.go b/pkg/sentry/kernel/futex/atomicptr_bucket_unsafe.go index d3fdf09b0..10834811b 100644 --- a/pkg/sentry/kernel/futex/atomicptr_bucket_unsafe.go +++ b/pkg/sentry/kernel/futex/atomicptr_bucket_unsafe.go @@ -27,6 +27,8 @@ func (p *AtomicPtrBucket) loadPtr(v *bucket) { // Load returns the value set by the most recent Store. It returns nil if there // has been no previous call to Store. +// +//go:nosplit func (p *AtomicPtrBucket) Load() *bucket { return (*bucket)(atomic.LoadPointer(&p.ptr)) } |