diff options
| author | Jamie Liu <jamieliu@google.com> | 2019-03-14 08:11:36 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-03-14 08:12:48 -0700 |
| commit | 8f4634997bd97810a85a70b71f000378d9db2e55 (patch) | |
| tree | 903096f91ee8f201fa622296e0f04cf7c7cd9013 /pkg/sentry/kernel/timekeeper.go | |
| parent | fb9919881c7dc98eaf97cad2a70d187bd78f1566 (diff) | |
Decouple filemem from platform and move it to pgalloc.MemoryFile.
This is in preparation for improved page cache reclaim, which requires
greater integration between the page cache and page allocator.
PiperOrigin-RevId: 238444706
Change-Id: Id24141b3678d96c7d7dc24baddd9be555bffafe4
Diffstat (limited to 'pkg/sentry/kernel/timekeeper.go')
| -rw-r--r-- | pkg/sentry/kernel/timekeeper.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/timekeeper.go b/pkg/sentry/kernel/timekeeper.go index 6bff80f13..d7bd85e78 100644 --- a/pkg/sentry/kernel/timekeeper.go +++ b/pkg/sentry/kernel/timekeeper.go @@ -21,6 +21,7 @@ import ( "gvisor.googlesource.com/gvisor/pkg/log" ktime "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/time" + "gvisor.googlesource.com/gvisor/pkg/sentry/pgalloc" "gvisor.googlesource.com/gvisor/pkg/sentry/platform" sentrytime "gvisor.googlesource.com/gvisor/pkg/sentry/time" ) @@ -85,9 +86,9 @@ type Timekeeper struct { // NewTimekeeper does not take ownership of paramPage. // // SetClocks must be called on the returned Timekeeper before it is usable. -func NewTimekeeper(platform platform.Platform, paramPage platform.FileRange) (*Timekeeper, error) { +func NewTimekeeper(mfp pgalloc.MemoryFileProvider, paramPage platform.FileRange) (*Timekeeper, error) { return &Timekeeper{ - params: NewVDSOParamPage(platform, paramPage), + params: NewVDSOParamPage(mfp, paramPage), }, nil } |