From 2b024373dcd9800f0cae693839fac6ede8d64a8c Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 3 Sep 2018 19:00:32 +0000 Subject: [PATCH] Revert "unix: implement SyncFileRange for ARM" This reverts commit 1b73967140201b02a8420ee8555ed00a432e97c0 (https://go-review.googlesource.com/c/sys/+/133015) Reason for revert: breaks the build. No Syscall9 on linux/arm. Not obvious this was ever compiled, much less tested. (Unless it was only for gccgo, but that was never specified.) Fixes golang/go#27475 Change-Id: I5ed04c9ab672ce33adc64bdaec601bf73df42269 Reviewed-on: https://go-review.googlesource.com/133095 Reviewed-by: Brad Fitzpatrick --- unix/syscall_linux_arm.go | 1 - unix/zsyscall_linux_arm.go | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/unix/syscall_linux_arm.go b/unix/syscall_linux_arm.go index fb9b906e..3ec7a932 100644 --- a/unix/syscall_linux_arm.go +++ b/unix/syscall_linux_arm.go @@ -141,7 +141,6 @@ func Fadvise(fd int, offset int64, length int64, advice int) (err error) { } //sys mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) -//sys SyncFileRange(fd int, off int64, n int64, flags int) (err error) = SYS_ARM_SYNC_FILE_RANGE func Fstatfs(fd int, buf *Statfs_t) (err error) { _, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf))) diff --git a/unix/zsyscall_linux_arm.go b/unix/zsyscall_linux_arm.go index 0231d033..d29a11c9 100644 --- a/unix/zsyscall_linux_arm.go +++ b/unix/zsyscall_linux_arm.go @@ -2177,16 +2177,6 @@ func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func SyncFileRange(fd int, off int64, n int64, flags int) (err error) { - _, _, e1 := Syscall9(SYS_ARM_SYNC_FILE_RANGE, uintptr(fd), 0, uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func getrlimit(resource int, rlim *rlimit32) (err error) { _, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0) if e1 != 0 {