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.

diff --git a/arch/arm/syscall_arch.h b/arch/arm/syscall_arch.h
index 64461ec..6023303 100644 (file)
--- 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 e7cb1a2..004060e 100644 (file)
--- 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 (file)
index 5c52f6b..0000000
--- a/src/fcntl/arm/posix_fadvise.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <fcntl.h>
-#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 fc1562e..c1a0ef5 100644 (file)
--- 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);