diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-30 20:47:08 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-30 20:47:08 +0000 |
| commit | 8110ab1bd357b5cb6cdf4e18e9fabf8cbe4950e5 (patch) | |
| tree | 52c621494f5f8184b356c33cfdeeb8e7ae7c7a45 /pkg/tcpip/link/rawfile | |
| parent | 904163540563b2d9c1069ae348a1a4e05efc675c (diff) | |
| parent | 62ea5c0a2212b9827f093551fc3da166facb9f0b (diff) | |
Merge release-20210726.0-12-g62ea5c0a2 (automated)
Diffstat (limited to 'pkg/tcpip/link/rawfile')
| -rw-r--r-- | pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go | 7 | ||||
| -rw-r--r-- | pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go index da900c24b..0b7b9e3de 100644 --- a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go +++ b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ((linux && amd64) || (linux && arm64)) && go1.12 && !go1.18 +//go:build ((linux && amd64) || (linux && arm64)) && go1.12 // +build linux,amd64 linux,arm64 // +build go1.12 -// +build !go1.18 -// Check go:linkname function signatures when updating Go version. +// //go:linkname directives type-checked by checklinkname. Any other +// non-linkname assumptions outside the Go 1 compatibility guarantee should +// have an accompanied vet check or version guard build tag. package rawfile diff --git a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go index cc9eea2a0..c42f3a3b6 100644 --- a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go +++ b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go @@ -1,12 +1,11 @@ // automatically generated by stateify. -//go:build linux && !amd64 && !arm64 && ((linux && amd64) || (linux && arm64)) && go1.12 && !go1.18 && linux +//go:build linux && !amd64 && !arm64 && ((linux && amd64) || (linux && arm64)) && go1.12 && linux // +build linux // +build !amd64 // +build !arm64 // +build linux,amd64 linux,arm64 // +build go1.12 -// +build !go1.18 // +build linux package rawfile |