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/memutil | |
parent | 02b4889106d6c4fe2b9d931c2525d6a55994e2e8 (diff) | |
parent | 1ad382220048339cb1aeecef7d69b9ddffd9168c (diff) |
Merge release-20210712.0-29-g1ad382220 (automated)
Diffstat (limited to 'pkg/memutil')
-rw-r--r-- | pkg/memutil/memfd_linux_unsafe.go | 1 | ||||
-rw-r--r-- | pkg/memutil/memutil_state_autogen.go | 2 | ||||
-rw-r--r-- | pkg/memutil/mmap.go | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/pkg/memutil/memfd_linux_unsafe.go b/pkg/memutil/memfd_linux_unsafe.go index 504382213..2179c92f3 100644 --- a/pkg/memutil/memfd_linux_unsafe.go +++ b/pkg/memutil/memfd_linux_unsafe.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build linux // +build linux package memutil diff --git a/pkg/memutil/memutil_state_autogen.go b/pkg/memutil/memutil_state_autogen.go index 89848555d..4aa01530c 100644 --- a/pkg/memutil/memutil_state_autogen.go +++ b/pkg/memutil/memutil_state_autogen.go @@ -1,3 +1,5 @@ // automatically generated by stateify. +// +build go1.1 + package memutil diff --git a/pkg/memutil/mmap.go b/pkg/memutil/mmap.go index 7c939293f..7a55d1b28 100644 --- a/pkg/memutil/mmap.go +++ b/pkg/memutil/mmap.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 memutil import ( |