diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-13 23:58:29 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-13 23:58:29 +0000 |
| commit | 45f8d3300e597c68b8f5ebbdf29ed46dfd5743a1 (patch) | |
| tree | bc43db172ef6188f10ef6fc131b4036dd9b64f20 /pkg/sentry/fs/ashmem | |
| parent | 82f69f0f330b81468adfb43726cf60c1ad8b16b7 (diff) | |
| parent | add40fd6ad4c136bc17d1f243ec199c7bf37fa0b (diff) | |
Merge add40fd6 (automated)
Diffstat (limited to 'pkg/sentry/fs/ashmem')
| -rw-r--r-- | pkg/sentry/fs/ashmem/area.go | 22 | ||||
| -rwxr-xr-x | pkg/sentry/fs/ashmem/ashmem_state_autogen.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/fs/ashmem/device.go | 10 | ||||
| -rw-r--r-- | pkg/sentry/fs/ashmem/pin_board.go | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/pkg/sentry/fs/ashmem/area.go b/pkg/sentry/fs/ashmem/area.go index b4b0cc08b..cae3e4dda 100644 --- a/pkg/sentry/fs/ashmem/area.go +++ b/pkg/sentry/fs/ashmem/area.go @@ -17,17 +17,17 @@ package ashmem import ( "sync" - "gvisor.googlesource.com/gvisor/pkg/abi/linux" - "gvisor.googlesource.com/gvisor/pkg/sentry/arch" - "gvisor.googlesource.com/gvisor/pkg/sentry/context" - "gvisor.googlesource.com/gvisor/pkg/sentry/fs" - "gvisor.googlesource.com/gvisor/pkg/sentry/fs/fsutil" - "gvisor.googlesource.com/gvisor/pkg/sentry/fs/tmpfs" - "gvisor.googlesource.com/gvisor/pkg/sentry/memmap" - "gvisor.googlesource.com/gvisor/pkg/sentry/usage" - "gvisor.googlesource.com/gvisor/pkg/sentry/usermem" - "gvisor.googlesource.com/gvisor/pkg/syserror" - "gvisor.googlesource.com/gvisor/pkg/waiter" + "gvisor.dev/gvisor/pkg/abi/linux" + "gvisor.dev/gvisor/pkg/sentry/arch" + "gvisor.dev/gvisor/pkg/sentry/context" + "gvisor.dev/gvisor/pkg/sentry/fs" + "gvisor.dev/gvisor/pkg/sentry/fs/fsutil" + "gvisor.dev/gvisor/pkg/sentry/fs/tmpfs" + "gvisor.dev/gvisor/pkg/sentry/memmap" + "gvisor.dev/gvisor/pkg/sentry/usage" + "gvisor.dev/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/syserror" + "gvisor.dev/gvisor/pkg/waiter" ) const ( diff --git a/pkg/sentry/fs/ashmem/ashmem_state_autogen.go b/pkg/sentry/fs/ashmem/ashmem_state_autogen.go index c4469b13a..13defb033 100755 --- a/pkg/sentry/fs/ashmem/ashmem_state_autogen.go +++ b/pkg/sentry/fs/ashmem/ashmem_state_autogen.go @@ -3,7 +3,7 @@ package ashmem import ( - "gvisor.googlesource.com/gvisor/pkg/state" + "gvisor.dev/gvisor/pkg/state" ) func (x *Area) beforeSave() {} diff --git a/pkg/sentry/fs/ashmem/device.go b/pkg/sentry/fs/ashmem/device.go index 22e1530e9..594039367 100644 --- a/pkg/sentry/fs/ashmem/device.go +++ b/pkg/sentry/fs/ashmem/device.go @@ -16,11 +16,11 @@ package ashmem import ( - "gvisor.googlesource.com/gvisor/pkg/abi/linux" - "gvisor.googlesource.com/gvisor/pkg/sentry/context" - "gvisor.googlesource.com/gvisor/pkg/sentry/fs" - "gvisor.googlesource.com/gvisor/pkg/sentry/fs/fsutil" - "gvisor.googlesource.com/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/abi/linux" + "gvisor.dev/gvisor/pkg/sentry/context" + "gvisor.dev/gvisor/pkg/sentry/fs" + "gvisor.dev/gvisor/pkg/sentry/fs/fsutil" + "gvisor.dev/gvisor/pkg/sentry/usermem" ) // Device implements fs.InodeOperations. diff --git a/pkg/sentry/fs/ashmem/pin_board.go b/pkg/sentry/fs/ashmem/pin_board.go index bdf23b371..c5400dd94 100644 --- a/pkg/sentry/fs/ashmem/pin_board.go +++ b/pkg/sentry/fs/ashmem/pin_board.go @@ -14,7 +14,7 @@ package ashmem -import "gvisor.googlesource.com/gvisor/pkg/abi/linux" +import "gvisor.dev/gvisor/pkg/abi/linux" const maxUint64 = ^uint64(0) |