diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-27 19:03:14 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-27 19:03:14 +0000 |
| commit | 849e740a83ea9d5c52f727ec4c0169b42f55287b (patch) | |
| tree | a4d9b30737158343f53f046ffc72deacc1117f4f /pkg/sentry/kernel/timekeeper.go | |
| parent | bd34346f555b8ecb00b5eb06dedf8ec95904dd13 (diff) | |
| parent | f347a578b79c96c13ed492b2cf9aec1cb3e60f3f (diff) | |
Merge release-20200622.1-232-gf347a578b (automated)
Diffstat (limited to 'pkg/sentry/kernel/timekeeper.go')
| -rw-r--r-- | pkg/sentry/kernel/timekeeper.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/timekeeper.go b/pkg/sentry/kernel/timekeeper.go index 5f3908d8b..7c4fefb16 100644 --- a/pkg/sentry/kernel/timekeeper.go +++ b/pkg/sentry/kernel/timekeeper.go @@ -21,8 +21,8 @@ import ( "gvisor.dev/gvisor/pkg/log" ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/pgalloc" - "gvisor.dev/gvisor/pkg/sentry/platform" sentrytime "gvisor.dev/gvisor/pkg/sentry/time" "gvisor.dev/gvisor/pkg/sync" ) @@ -90,7 +90,7 @@ type Timekeeper struct { // NewTimekeeper does not take ownership of paramPage. // // SetClocks must be called on the returned Timekeeper before it is usable. -func NewTimekeeper(mfp pgalloc.MemoryFileProvider, paramPage platform.FileRange) (*Timekeeper, error) { +func NewTimekeeper(mfp pgalloc.MemoryFileProvider, paramPage memmap.FileRange) (*Timekeeper, error) { return &Timekeeper{ params: NewVDSOParamPage(mfp, paramPage), }, nil |