diff options
| author | Jamie Liu <jamieliu@google.com> | 2018-12-20 13:27:25 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-12-20 13:28:46 -0800 |
| commit | 194ef586fcb1bec049ee8777c2e5f70997de7a87 (patch) | |
| tree | 4bc765fd4ccd858d58b0e9c9e15eb266c52eee20 /pkg/sentry/limits | |
| parent | 25d62850ce8a420600194009a7257148c43cc5f8 (diff) | |
Rename limits.MemoryPagesLocked to limits.MemoryLocked.
"RLIMIT_MEMLOCK: This is the maximum number of bytes of memory that may
be locked into RAM." - getrlimit(2)
PiperOrigin-RevId: 226384346
Change-Id: Iefac4a1bb69f7714dc813b5b871226a8344dc800
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 ba0b7d4fd..eeca01876 100644 --- a/pkg/sentry/limits/limits.go +++ b/pkg/sentry/limits/limits.go @@ -33,7 +33,7 @@ const ( Rss ProcessCount NumberOfFiles - MemoryPagesLocked + MemoryLocked AS Locks SignalsPending diff --git a/pkg/sentry/limits/linux.go b/pkg/sentry/limits/linux.go index 511db6733..295f9c398 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: MemoryPagesLocked, + linux.RLIMIT_MEMLOCK: MemoryLocked, linux.RLIMIT_AS: AS, linux.RLIMIT_LOCKS: Locks, linux.RLIMIT_SIGPENDING: SignalsPending, |