diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-13 18:05:22 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-13 18:05:22 +0000 |
| commit | c2c8729c1838fb30e5cd2a0f2c9689f4abf5b882 (patch) | |
| tree | 7bcb6692bfab3238b4c89b897d777ef3c09cf8e5 /pkg/sentry/kernel/shm | |
| parent | 621c6d551f577f98db5d94f4b96e1082c8213533 (diff) | |
| parent | 6a4d17a31dc209afbbca66e871a7c6dc299c167b (diff) | |
Merge release-20200323.0-134-g6a4d17a (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm')
| -rw-r--r-- | pkg/sentry/kernel/shm/shm.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/shm/shm.go b/pkg/sentry/kernel/shm/shm.go index 208569057..f66cfcc7f 100644 --- a/pkg/sentry/kernel/shm/shm.go +++ b/pkg/sentry/kernel/shm/shm.go @@ -461,7 +461,7 @@ func (s *Shm) AddMapping(ctx context.Context, _ memmap.MappingSpace, _ usermem.A func (s *Shm) RemoveMapping(ctx context.Context, _ memmap.MappingSpace, _ usermem.AddrRange, _ uint64, _ bool) { s.mu.Lock() defer s.mu.Unlock() - // TODO(b/38173783): RemoveMapping may be called during task exit, when ctx + // RemoveMapping may be called during task exit, when ctx // is context.Background. Gracefully handle missing clocks. Failing to // update the detach time in these cases is ok, since no one can observe the // omission. |