summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/proc/uptime.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/uptime.go
parente5f7f1a0ce57265b7cd3204c7566b4d4848fe6c3 (diff)
parentab48112e41427579ecf585f6280be1e2d58acf06 (diff)
Merge release-20200115.0-14-gab48112 (automated)
Diffstat (limited to 'pkg/sentry/fs/proc/uptime.go')
-rw-r--r--pkg/sentry/fs/proc/uptime.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/fs/proc/uptime.go b/pkg/sentry/fs/proc/uptime.go
index 4e903917a..adfe58adb 100644
--- a/pkg/sentry/fs/proc/uptime.go
+++ b/pkg/sentry/fs/proc/uptime.go
@@ -28,6 +28,8 @@ import (
"gvisor.dev/gvisor/pkg/waiter"
)
+// LINT.IfChange
+
// uptime is a file containing the system uptime.
//
// +stateify savable
@@ -85,3 +87,5 @@ func (f *uptimeFile) Read(ctx context.Context, _ *fs.File, dst usermem.IOSequenc
n, err := dst.CopyOut(ctx, s[offset:])
return int64(n), err
}
+
+// LINT.ThenChange(../../fsimpl/proc/tasks_files.go)