mcst-linux-kernel/patches-2024.06.26/containerd-1.5.2/0002_bug138550.patch

42 lines
1.5 KiB
Diff

diff --git a/sys/subprocess_unsafe_linux.go
b/vendor/github.com/containerd/containerd/sys/subprocess_unsafe_linux.go
index 6e40a9c7d7..c086dc5226 100644
--- a/sys/subprocess_unsafe_linux.go
+++ b/sys/subprocess_unsafe_linux.go
@@ -20,11 +20,11 @@ import (
_ "unsafe" // required for go:linkname.
)
-//go:linkname beforeFork syscall.runtime_BeforeFork
+//go:linkname beforeFork syscall.runtime__BeforeFork
func beforeFork()
-//go:linkname afterFork syscall.runtime_AfterFork
+//go:linkname afterFork syscall.runtime__AfterFork
func afterFork()
-//go:linkname afterForkInChild syscall.runtime_AfterForkInChild
+//go:linkname afterForkInChild syscall.runtime__AfterForkInChild
func afterForkInChild()
diff --git a/vendor/github.com/modern-go/reflect2/unsafe_link.go
b/vendor/github.com/modern-go/reflect2/unsafe_link.go
index 57229c8db4..6c46c78f5e 100644
--- a/vendor/github.com/modern-go/reflect2/unsafe_link.go
+++ b/vendor/github.com/modern-go/reflect2/unsafe_link.go
@@ -2,13 +2,13 @@ package reflect2
import "unsafe"
-//go:linkname unsafe_New reflect.unsafe_New
+//go:linkname unsafe_New reflect.unsafe__New
func unsafe_New(rtype unsafe.Pointer) unsafe.Pointer
//go:linkname typedmemmove reflect.typedmemmove
func typedmemmove(rtype unsafe.Pointer, dst, src unsafe.Pointer)
-//go:linkname unsafe_NewArray reflect.unsafe_NewArray
+//go:linkname unsafe_NewArray reflect.unsafe__NewArray
func unsafe_NewArray(rtype unsafe.Pointer, length int) unsafe.Pointer
// typedslicecopy copies a slice of elemType values from src to dst,