From 3dd27f3aabf03b109c30648c3f7a209302deee7f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 1 Jul 2016 13:32:35 -0400 Subject: [PATCH] fix posix_fadvise syscall args on powerpc, unify with arm fix commit 6d38c9cf80f47623e5e48190046673bbd0dc410b provided an arm-specific version of posix_fadvise to address the alternate argument order the kernel expects on arm, but neglected to address that powerpc (32-bit) has the same issue. instead of having arch variant files in duplicate, simply put the alternate version in the top-level file under the control of a macro defined in syscall_arch.h. --- arch/arm/syscall_arch.h | 2 ++ arch/powerpc/syscall_arch.h | 2 ++ src/fcntl/arm/posix_fadvise.c | 12 ------------ src/fcntl/posix_fadvise.c | 8 ++++++++ 4 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 src/fcntl/arm/posix_fadvise.c diff --git a/arch/arm/syscall_arch.h b/arch/arm/syscall_arch.h index 64461ec8..6023303b 100644 --- a/arch/arm/syscall_arch.h +++ b/arch/arm/syscall_arch.h @@ -76,3 +76,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo #define VDSO_USEFUL #define VDSO_CGT_SYM "__vdso_clock_gettime" #define VDSO_CGT_VER "LINUX_2.6" + +#define SYSCALL_FADVISE_6_ARG diff --git a/arch/powerpc/syscall_arch.h b/arch/powerpc/syscall_arch.h index e7cb1a26..004060e6 100644 --- a/arch/powerpc/syscall_arch.h +++ b/arch/powerpc/syscall_arch.h @@ -5,3 +5,5 @@ #undef SYSCALL_NO_INLINE #define SYSCALL_NO_INLINE + +#define SYSCALL_FADVISE_6_ARG diff --git a/src/fcntl/arm/posix_fadvise.c b/src/fcntl/arm/posix_fadvise.c deleted file mode 100644 index 5c52f6b8..00000000 --- a/src/fcntl/arm/posix_fadvise.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include "syscall.h" -#include "libc.h" - -int posix_fadvise(int fd, off_t base, off_t len, int advice) -{ - /* ARM-specific syscall argument order */ - return -__syscall(SYS_fadvise, fd, advice, - __SYSCALL_LL_E(base), __SYSCALL_LL_E(len)); -} - -LFS64(posix_fadvise); diff --git a/src/fcntl/posix_fadvise.c b/src/fcntl/posix_fadvise.c index fc1562e2..c1a0ef5a 100644 --- a/src/fcntl/posix_fadvise.c +++ b/src/fcntl/posix_fadvise.c @@ -4,8 +4,16 @@ int posix_fadvise(int fd, off_t base, off_t len, int advice) { +#if defined(SYSCALL_FADVISE_6_ARG) + /* Some archs, at least arm and powerpc, have the syscall + * arguments reordered to avoid needing 7 argument registers + * due to 64-bit argument alignment. */ + return -__syscall(SYS_fadvise, fd, advice, + __SYSCALL_LL_E(base), __SYSCALL_LL_E(len)); +#else return -__syscall(SYS_fadvise, fd, __SYSCALL_LL_O(base), __SYSCALL_LL_E(len), advice); +#endif } LFS64(posix_fadvise); -- 2.25.1