summaryrefslogtreecommitdiffhomepage
path: root/pkg/memutil
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-03-03 18:43:27 +0000
committergVisor bot <gvisor-bot@google.com>2021-03-03 18:43:27 +0000
commitaae5455fe381c4cbc956f61c971284ee05c52dfc (patch)
tree2b1cb0233968680dcd0374f20ee826cf311bda95 /pkg/memutil
parente2599d556573b05eb3714c1e791fa29431dc3d3f (diff)
parenta9441aea2780da8c93da1c73da860219f98438de (diff)
Merge release-20210301.0-5-ga9441aea2 (automated)
Diffstat (limited to 'pkg/memutil')
-rw-r--r--pkg/memutil/memutil_unsafe.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/memutil/memutil_unsafe.go b/pkg/memutil/memutil_unsafe.go
index 979d942a9..6676d1ce3 100644
--- a/pkg/memutil/memutil_unsafe.go
+++ b/pkg/memutil/memutil_unsafe.go
@@ -19,7 +19,6 @@ package memutil
import (
"fmt"
- "syscall"
"unsafe"
"golang.org/x/sys/unix"
@@ -27,13 +26,13 @@ import (
// CreateMemFD creates a memfd file and returns the fd.
func CreateMemFD(name string, flags int) (int, error) {
- p, err := syscall.BytePtrFromString(name)
+ p, err := unix.BytePtrFromString(name)
if err != nil {
return -1, err
}
- fd, _, e := syscall.Syscall(unix.SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+ fd, _, e := unix.Syscall(unix.SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
if e != 0 {
- if e == syscall.ENOSYS {
+ if e == unix.ENOSYS {
return -1, fmt.Errorf("memfd_create(2) is not implemented. Check that you have Linux 3.17 or higher")
}
return -1, e