diff options
| author | Kevin Krakauer <krakauer@google.com> | 2019-06-12 15:21:22 -0700 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2019-06-12 15:21:22 -0700 |
| commit | 0bbbcafd68154e7c7b46692b84a39fb6bb5f1568 (patch) | |
| tree | d8fba01ad76900715665b0418a786de2d77e2a05 /pkg/sentry/mm/vma.go | |
| parent | 06a83df533244dc2b3b8adfc1bf0608d3753c1d9 (diff) | |
| parent | 70578806e8d3e01fae2249b3e602cd5b05d378a0 (diff) | |
Merge branch 'master' into iptables-1-pkg
Change-Id: I7457a11de4725e1bf3811420c505d225b1cb6943
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 |