diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-01-26 11:22:42 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-01-26 11:22:42 -0600 |
| commit | f03fbbb009c0df52d363719a592e2ac33577d9a6 (patch) | |
| tree | 01671bcc5099ef304faf5ae86d58bbf32f9d0b7c /libc/sysdeps | |
| parent | 97dc8cb71d96a4bbfda0aa51740433d5da825b6a (diff) | |
| parent | 92de8a5f6ffb1ff9f7183fd08d872aa098b75ae2 (diff) | |
merge upstream changes
Diffstat (limited to 'libc/sysdeps')
| -rw-r--r-- | libc/sysdeps/linux/common/mknod.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/sync_file_range.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/mknod.c b/libc/sysdeps/linux/common/mknod.c index 794e19f57..e0c54e6e3 100644 --- a/libc/sysdeps/linux/common/mknod.c +++ b/libc/sysdeps/linux/common/mknod.c @@ -25,7 +25,7 @@ int mknod(const char *path, mode_t mode, dev_t dev) k_dev = (dev) & ((1ULL << 32) - 1); if (k_dev != dev) { - __set_errno (EINVAL); + __set_errno(EINVAL); return -1; } return INLINE_SYSCALL(mknod, 3, path, mode, (unsigned int)k_dev); diff --git a/libc/sysdeps/linux/common/sync_file_range.c b/libc/sysdeps/linux/common/sync_file_range.c index 8d4ed9210..6cd7e94d6 100644 --- a/libc/sysdeps/linux/common/sync_file_range.c +++ b/libc/sysdeps/linux/common/sync_file_range.c @@ -23,10 +23,13 @@ static int __NC(sync_file_range)(int fd, off64_t offset, off64_t nbytes, unsigned int flags) { # if defined __powerpc__ && __WORDSIZE == 64 - return INLINE_SYSCALL(sync_file_range, 4, fd, offset, nbytes, flags); + return INLINE_SYSCALL(sync_file_range, 4, fd, flags, offset, nbytes); # elif defined __mips__ && _MIPS_SIM == _ABIO32 return INLINE_SYSCALL(sync_file_range, 7, fd, 0, OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags); +# elif defined __NR_sync_file_range2 + return INLINE_SYSCALL(sync_file_range, 6, fd, flags, + OFF64_HI_LO(offset), OFF64_HI_LO(nbytes)); # else return INLINE_SYSCALL(sync_file_range, 6, fd, OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags); |