summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2023-02-08 19:15:23 +0000
committerMichael Pratt <mpratt@google.com>2023-02-15 21:45:15 +0000
commitf5d4363d136cfe0d9dfe7554586f1edda0b7d9cf (patch)
tree5478b17aa627213827e3430336a2b8b7088134e7
parent97fe3a23b68dd2df748f2369827aeab2420e0930 (diff)
downloadgo-git-f5d4363d136cfe0d9dfe7554586f1edda0b7d9cf.tar.gz
[release-branch.go1.19] runtime: fix signature for linked functions
These functions are linked using go:linkname, but do not match the original declarations. This change brings these in sync. For #58441. Change-Id: I16651304c3dba2f9897c2c42e30555d2f7805c2a Reviewed-on: https://go-review.googlesource.com/c/go/+/466615 Reviewed-by: Michael Pratt <mpratt@google.com> Run-TryBot: Michael Pratt <mpratt@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Auto-Submit: Michael Pratt <mpratt@google.com> (cherry picked from commit 8fb9565832e6dbacaaa057ffabc251a9341f8d23) Reviewed-on: https://go-review.googlesource.com/c/go/+/466858 Reviewed-by: Austin Clements <austin@google.com> Reviewed-by: Ian Lance Taylor <iant@google.com>
-rw-r--r--src/internal/poll/fd_poll_runtime.go2
-rw-r--r--src/sync/atomic/value.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/internal/poll/fd_poll_runtime.go b/src/internal/poll/fd_poll_runtime.go
index 4d3cc78405..0a2e76d73f 100644
--- a/src/internal/poll/fd_poll_runtime.go
+++ b/src/internal/poll/fd_poll_runtime.go
@@ -23,7 +23,7 @@ func runtime_pollServerInit()
func runtime_pollOpen(fd uintptr) (uintptr, int)
func runtime_pollClose(ctx uintptr)
func runtime_pollWait(ctx uintptr, mode int) int
-func runtime_pollWaitCanceled(ctx uintptr, mode int) int
+func runtime_pollWaitCanceled(ctx uintptr, mode int)
func runtime_pollReset(ctx uintptr, mode int) int
func runtime_pollSetDeadline(ctx uintptr, d int64, mode int)
func runtime_pollUnblock(ctx uintptr)
diff --git a/src/sync/atomic/value.go b/src/sync/atomic/value.go
index 88315f2d88..bd1fcb976d 100644
--- a/src/sync/atomic/value.go
+++ b/src/sync/atomic/value.go
@@ -190,5 +190,5 @@ func (v *Value) CompareAndSwap(old, new any) (swapped bool) {
}
// Disable/enable preemption, implemented in runtime.
-func runtime_procPin()
+func runtime_procPin() int
func runtime_procUnpin()