summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/proc/meminfo.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-16 23:19:30 +0000
committergVisor bot <gvisor-bot@google.com>2020-01-16 23:19:30 +0000
commit894e4241a1cbbe065c8802c4ddba988c43f5c2b7 (patch)
treea8a5eb8339cf390a1ba1783ae5ec36bca52871b9 /pkg/sentry/fs/proc/meminfo.go
parente5f7f1a0ce57265b7cd3204c7566b4d4848fe6c3 (diff)
parentab48112e41427579ecf585f6280be1e2d58acf06 (diff)
Merge release-20200115.0-14-gab48112 (automated)
Diffstat (limited to 'pkg/sentry/fs/proc/meminfo.go')
-rw-r--r--pkg/sentry/fs/proc/meminfo.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/fs/proc/meminfo.go b/pkg/sentry/fs/proc/meminfo.go
index 495f3e3ba..313c6a32b 100644
--- a/pkg/sentry/fs/proc/meminfo.go
+++ b/pkg/sentry/fs/proc/meminfo.go
@@ -25,6 +25,8 @@ import (
"gvisor.dev/gvisor/pkg/sentry/usermem"
)
+// LINT.IfChange
+
// meminfoData backs /proc/meminfo.
//
// +stateify savable
@@ -83,3 +85,5 @@ func (d *meminfoData) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle)
fmt.Fprintf(&buf, "Shmem: %8d kB\n", snapshot.Tmpfs/1024)
return []seqfile.SeqData{{Buf: buf.Bytes(), Handle: (*meminfoData)(nil)}}, 0
}
+
+// LINT.ThenChange(../../fsimpl/proc/tasks_files.go)