diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-03-03 18:43:27 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-03 18:43:27 +0000 |
| commit | aae5455fe381c4cbc956f61c971284ee05c52dfc (patch) | |
| tree | 2b1cb0233968680dcd0374f20ee826cf311bda95 /pkg/sentry/usage | |
| parent | e2599d556573b05eb3714c1e791fa29431dc3d3f (diff) | |
| parent | a9441aea2780da8c93da1c73da860219f98438de (diff) | |
Merge release-20210301.0-5-ga9441aea2 (automated)
Diffstat (limited to 'pkg/sentry/usage')
| -rw-r--r-- | pkg/sentry/usage/memory.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/usage/memory.go b/pkg/sentry/usage/memory.go index 5ed6726ab..581862ee2 100644 --- a/pkg/sentry/usage/memory.go +++ b/pkg/sentry/usage/memory.go @@ -18,8 +18,8 @@ import ( "fmt" "os" "sync/atomic" - "syscall" + "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/bits" "gvisor.dev/gvisor/pkg/memutil" "gvisor.dev/gvisor/pkg/sync" @@ -132,7 +132,7 @@ func Init() error { // always be the case for a newly mapped page from /dev/shm. If we obtain // the shared memory through some other means in the future, we may have to // explicitly zero the page. - mmap, err := syscall.Mmap(int(file.Fd()), 0, int(RTMemoryStatsSize), syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_SHARED) + mmap, err := unix.Mmap(int(file.Fd()), 0, int(RTMemoryStatsSize), unix.PROT_READ|unix.PROT_WRITE, unix.MAP_SHARED) if err != nil { return fmt.Errorf("error mapping usage file: %v", err) } |