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/shm/shm.go | |
| parent | bd34346f555b8ecb00b5eb06dedf8ec95904dd13 (diff) | |
| parent | f347a578b79c96c13ed492b2cf9aec1cb3e60f3f (diff) | |
Merge release-20200622.1-232-gf347a578b (automated)
Diffstat (limited to 'pkg/sentry/kernel/shm/shm.go')
| -rw-r--r-- | pkg/sentry/kernel/shm/shm.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/shm/shm.go b/pkg/sentry/kernel/shm/shm.go index f66cfcc7f..55b4c2cdb 100644 --- a/pkg/sentry/kernel/shm/shm.go +++ b/pkg/sentry/kernel/shm/shm.go @@ -45,7 +45,6 @@ import ( 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" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/syserror" @@ -370,7 +369,7 @@ type Shm struct { // fr is the offset into mfp.MemoryFile() that backs this contents of this // segment. Immutable. - fr platform.FileRange + fr memmap.FileRange // mu protects all fields below. mu sync.Mutex `state:"nosave"` |