summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/usage/memory.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-10-15 01:46:20 +0000
committergVisor bot <gvisor-bot@google.com>2021-10-15 01:46:20 +0000
commit8d5428e2668e1af6d6801af4337b4274c69f72db (patch)
treec5a6981b075f73476c71f1c72d1ead84ee12a77f /pkg/sentry/usage/memory.go
parentd75b58d63ab2dd2509a387530b899545c0d36917 (diff)
parent33b41d8fe98e7820118e8d42b0cfbec4ca159d62 (diff)
Merge release-20211005.0-47-g33b41d8fe (automated)
Diffstat (limited to 'pkg/sentry/usage/memory.go')
-rw-r--r--pkg/sentry/usage/memory.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/usage/memory.go b/pkg/sentry/usage/memory.go
index e7073ec87..d9df890c4 100644
--- a/pkg/sentry/usage/memory.go
+++ b/pkg/sentry/usage/memory.go
@@ -252,9 +252,9 @@ func (m *MemoryLocked) Copy() (MemoryStats, uint64) {
return ms, m.totalLocked()
}
-// These options control how much total memory the is reported to the application.
-// They may only be set before the application starts executing, and must not
-// be modified.
+// These options control how much total memory the is reported to the
+// application. They may only be set before the application starts executing,
+// and must not be modified.
var (
// MinimumTotalMemoryBytes is the minimum reported total system memory.
MinimumTotalMemoryBytes uint64 = 2 << 30 // 2 GB