diff options
| author | Googler <noreply@google.com> | 2018-12-19 13:29:10 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-12-19 13:30:08 -0800 |
| commit | 86c9bd254749ebf65270aa60f728d9c847ac02d4 (patch) | |
| tree | a46d2aa16add447aa5604975810fee5c839fd39f /pkg/sentry/limits | |
| parent | ff7178a4d10f9f1fb34e54fed5ef27cfbff5d6f9 (diff) | |
Automated rollback of changelist 225861605
PiperOrigin-RevId: 226224230
Change-Id: Id24c7d3733722fd41d5fe74ef64e0ce8c68f0b12
Diffstat (limited to 'pkg/sentry/limits')
| -rw-r--r-- | pkg/sentry/limits/limits.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/limits/linux.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/limits/limits.go b/pkg/sentry/limits/limits.go index eeca01876..ba0b7d4fd 100644 --- a/pkg/sentry/limits/limits.go +++ b/pkg/sentry/limits/limits.go @@ -33,7 +33,7 @@ const ( Rss ProcessCount NumberOfFiles - MemoryLocked + MemoryPagesLocked AS Locks SignalsPending diff --git a/pkg/sentry/limits/linux.go b/pkg/sentry/limits/linux.go index 295f9c398..511db6733 100644 --- a/pkg/sentry/limits/linux.go +++ b/pkg/sentry/limits/linux.go @@ -30,7 +30,7 @@ var FromLinuxResource = map[int]LimitType{ linux.RLIMIT_RSS: Rss, linux.RLIMIT_NPROC: ProcessCount, linux.RLIMIT_NOFILE: NumberOfFiles, - linux.RLIMIT_MEMLOCK: MemoryLocked, + linux.RLIMIT_MEMLOCK: MemoryPagesLocked, linux.RLIMIT_AS: AS, linux.RLIMIT_LOCKS: Locks, linux.RLIMIT_SIGPENDING: SignalsPending, |