diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-06-27 21:44:07 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-06-27 21:44:07 +0000 |
commit | 91dcb2483b56eeb8083cdff90ed8e8f0a1665d13 (patch) | |
tree | a2752b44b8da8abf49f60cef2a324068503111cb /pkg/sentry/memmap | |
parent | 085d6fdce34f34d82de5f71d031407c3da253b23 (diff) | |
parent | 5b41ba5d0eca266790dba5f5dd095010e3944726 (diff) |
Merge 5b41ba5d (automated)
Diffstat (limited to 'pkg/sentry/memmap')
-rw-r--r-- | pkg/sentry/memmap/mapping_set.go | 2 | ||||
-rwxr-xr-x | pkg/sentry/memmap/mapping_set_impl.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/memmap/mapping_set.go b/pkg/sentry/memmap/mapping_set.go index c87d4687a..0a5b7ce45 100644 --- a/pkg/sentry/memmap/mapping_set.go +++ b/pkg/sentry/memmap/mapping_set.go @@ -85,7 +85,7 @@ func (mappingSetFunctions) Merge(r1 MappableRange, val1 MappingsOfRange, r2 Mapp // Each MappingOfRange in val1 must have a matching region in val2, forming // one contiguous region. for k1 := range val1 { - // We expect val2 to to contain a key that forms a contiguous + // We expect val2 to contain a key that forms a contiguous // region with k1. k2 := MappingOfRange{ MappingSpace: k1.MappingSpace, diff --git a/pkg/sentry/memmap/mapping_set_impl.go b/pkg/sentry/memmap/mapping_set_impl.go index eb3071e89..e632f28a5 100755 --- a/pkg/sentry/memmap/mapping_set_impl.go +++ b/pkg/sentry/memmap/mapping_set_impl.go @@ -1185,7 +1185,7 @@ func (s *MappingSet) String() string { return s.root.String() } -// String stringifes a node (and all of its children) for debugging. +// String stringifies a node (and all of its children) for debugging. func (n *Mappingnode) String() string { var buf bytes.Buffer n.writeDebugString(&buf, "") |