diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-20 23:32:50 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-20 23:32:50 +0000 |
| commit | db333ee70648eeb5627940a7b37304cc1051a0f4 (patch) | |
| tree | 8d0f416662424bb5e1848cd717ee07a30342a7e1 /pkg/sentry/kernel | |
| parent | 02b4889106d6c4fe2b9d931c2525d6a55994e2e8 (diff) | |
| parent | 1ad382220048339cb1aeecef7d69b9ddffd9168c (diff) | |
Merge release-20210712.0-29-g1ad382220 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/kernel_opts.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/kernel/kernel_opts_state_autogen.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/kernel/ptrace_amd64.go | 1 | ||||
| -rw-r--r-- | pkg/sentry/kernel/ptrace_arm64.go | 1 |
5 files changed, 9 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/kernel_opts.go b/pkg/sentry/kernel/kernel_opts.go index 2e66ec587..5ffafb0d1 100644 --- a/pkg/sentry/kernel/kernel_opts.go +++ b/pkg/sentry/kernel/kernel_opts.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build go1.1 +// +build go1.1 + package kernel // SpecialOpts contains non-standard options for the kernel. diff --git a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go index 9c39d630a..3e0693a12 100644 --- a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go @@ -6,6 +6,8 @@ // is filtered based on pre-defined file suffixes related to build tags, see // tools/defs.bzl:calculate_sets(). +// +build go1.1 + package kernel import ( diff --git a/pkg/sentry/kernel/kernel_opts_state_autogen.go b/pkg/sentry/kernel/kernel_opts_state_autogen.go index 73334db4c..3a027c5ed 100644 --- a/pkg/sentry/kernel/kernel_opts_state_autogen.go +++ b/pkg/sentry/kernel/kernel_opts_state_autogen.go @@ -1,5 +1,7 @@ // automatically generated by stateify. +// +build go1.1 + package kernel import ( diff --git a/pkg/sentry/kernel/ptrace_amd64.go b/pkg/sentry/kernel/ptrace_amd64.go index 5ae05b5c3..63422e155 100644 --- a/pkg/sentry/kernel/ptrace_amd64.go +++ b/pkg/sentry/kernel/ptrace_amd64.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build amd64 // +build amd64 package kernel diff --git a/pkg/sentry/kernel/ptrace_arm64.go b/pkg/sentry/kernel/ptrace_arm64.go index 46dd84cbc..27514d67b 100644 --- a/pkg/sentry/kernel/ptrace_arm64.go +++ b/pkg/sentry/kernel/ptrace_arm64.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build arm64 // +build arm64 package kernel |