diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-10 22:42:41 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-10 22:42:41 +0000 |
| commit | 8390a8227b571e82c42e3e90aa28a7b86f7e3f9b (patch) | |
| tree | 8bfad5169182b7ba1c6ed5f3df0279729cc200b0 /pkg/sentry/mm/vma.go | |
| parent | 4f56f1bf2248bb17da8b269b4191218d85ce6587 (diff) | |
| parent | a00157cc0e216a9829f2659ce35c856a22aa5ba2 (diff) | |
Merge a00157cc (automated)
Diffstat (limited to 'pkg/sentry/mm/vma.go')
| -rw-r--r-- | pkg/sentry/mm/vma.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/mm/vma.go b/pkg/sentry/mm/vma.go index 02203f79f..0af8de5b0 100644 --- a/pkg/sentry/mm/vma.go +++ b/pkg/sentry/mm/vma.go @@ -107,6 +107,7 @@ func (mm *MemoryManager) createVMALocked(ctx context.Context, opts memmap.MMapOp private: opts.Private, growsDown: opts.GrowsDown, mlockMode: opts.MLockMode, + numaPolicy: linux.MPOL_DEFAULT, id: opts.MappingIdentity, hint: opts.Hint, } @@ -436,6 +437,8 @@ func (vmaSetFunctions) Merge(ar1 usermem.AddrRange, vma1 vma, ar2 usermem.AddrRa vma1.private != vma2.private || vma1.growsDown != vma2.growsDown || vma1.mlockMode != vma2.mlockMode || + vma1.numaPolicy != vma2.numaPolicy || + vma1.numaNodemask != vma2.numaNodemask || vma1.id != vma2.id || vma1.hint != vma2.hint { return vma{}, false |