diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-01 17:06:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-01 17:06:15 +0000 |
| commit | 7ac96cd64fb4f93f66bdbb70676e37e60bd8061e (patch) | |
| tree | 56f138df2f7fcd72015bf04b5a57a4c9022da721 /pkg/sentry | |
| parent | 43d53a034defd0d636be3652ac6d197df2bedfde (diff) | |
| parent | db7917556a7e4bd2cd6d183c68f04a4787dec493 (diff) | |
Merge release-20200323.0-48-gdb79175 (automated)
Diffstat (limited to 'pkg/sentry')
| -rwxr-xr-x | pkg/sentry/arch/arch_impl_state_autogen.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_state_autogen.go | 6 | ||||
| -rw-r--r-- | pkg/sentry/arch/arch_state_x86.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/arch/arch_x86.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_x86_impl.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/arch/signal_stack.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl_amd64.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/pagetables/pagetables_x86.go | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/pkg/sentry/arch/arch_impl_state_autogen.go b/pkg/sentry/arch/arch_impl_state_autogen.go index 8b567801f..55721c710 100755 --- a/pkg/sentry/arch/arch_impl_state_autogen.go +++ b/pkg/sentry/arch/arch_impl_state_autogen.go @@ -1,6 +1,6 @@ // automatically generated by stateify. -// +build amd64 i386 +// +build amd64 386 package arch diff --git a/pkg/sentry/arch/arch_state_autogen.go b/pkg/sentry/arch/arch_state_autogen.go index a06d96c71..1bcc94438 100755 --- a/pkg/sentry/arch/arch_state_autogen.go +++ b/pkg/sentry/arch/arch_state_autogen.go @@ -1,8 +1,8 @@ // automatically generated by stateify. -// +build amd64 i386 -// +build amd64 i386 -// +build i386 amd64 arm64 +// +build amd64 386 +// +build amd64 386 +// +build 386 amd64 arm64 package arch diff --git a/pkg/sentry/arch/arch_state_x86.go b/pkg/sentry/arch/arch_state_x86.go index e35c9214a..aa31169e0 100644 --- a/pkg/sentry/arch/arch_state_x86.go +++ b/pkg/sentry/arch/arch_state_x86.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build amd64 i386 +// +build amd64 386 package arch diff --git a/pkg/sentry/arch/arch_x86.go b/pkg/sentry/arch/arch_x86.go index 88b40a9d1..7fc4c0473 100644 --- a/pkg/sentry/arch/arch_x86.go +++ b/pkg/sentry/arch/arch_x86.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build amd64 i386 +// +build amd64 386 package arch diff --git a/pkg/sentry/arch/arch_x86_impl.go b/pkg/sentry/arch/arch_x86_impl.go index 04ac283c6..3edf40764 100755 --- a/pkg/sentry/arch/arch_x86_impl.go +++ b/pkg/sentry/arch/arch_x86_impl.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build amd64 i386 +// +build amd64 386 package arch diff --git a/pkg/sentry/arch/signal_stack.go b/pkg/sentry/arch/signal_stack.go index 1a6056171..e58f055c7 100644 --- a/pkg/sentry/arch/signal_stack.go +++ b/pkg/sentry/arch/signal_stack.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build i386 amd64 arm64 +// +build 386 amd64 arm64 package arch diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go index 178eabd85..e96c62c76 100755 --- a/pkg/sentry/platform/ring0/defs_impl_amd64.go +++ b/pkg/sentry/platform/ring0/defs_impl_amd64.go @@ -3,12 +3,12 @@ package ring0 import ( "fmt" "gvisor.dev/gvisor/pkg/cpuid" + "gvisor.dev/gvisor/pkg/usermem" "io" "reflect" "syscall" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" - "gvisor.dev/gvisor/pkg/usermem" ) // Kernel is a global kernel object. diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go b/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go index 52bab66fe..57037ca03 100755 --- a/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go +++ b/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go @@ -1,5 +1,5 @@ // automatically generated by stateify. -// +build i386 amd64 +// +build 386 amd64 package pagetables diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_x86.go b/pkg/sentry/platform/ring0/pagetables/pagetables_x86.go index dcf061df9..157438d9b 100644 --- a/pkg/sentry/platform/ring0/pagetables/pagetables_x86.go +++ b/pkg/sentry/platform/ring0/pagetables/pagetables_x86.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build i386 amd64 +// +build 386 amd64 package pagetables |