From 81c9eaafecd4b3d53ef09931fe2c65de1cda98ca Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 1 Apr 2013 05:40:42 -0400 Subject: linux: readahead: convert to SYSCALL_ALIGN_64BIT The readahead syscall has the 64bit register align issue for all arches. Only mips was handling this though. Clean up the common readahead.c to use the SYSCALL_ALIGN_64BIT define so that we can throw away the mips version and make this work correctly on arm/ppc/xtensa. Signed-off-by: Mike Frysinger --- libc/sysdeps/linux/common/readahead.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'libc/sysdeps/linux/common') diff --git a/libc/sysdeps/linux/common/readahead.c b/libc/sysdeps/linux/common/readahead.c index bbd9c0a26..bda0de2c7 100644 --- a/libc/sysdeps/linux/common/readahead.c +++ b/libc/sysdeps/linux/common/readahead.c @@ -23,26 +23,21 @@ # include # include -# define __NR___readahead __NR_readahead - # if __WORDSIZE == 64 -static __inline__ _syscall3(ssize_t, __readahead, int, fd, - off_t, offset, size_t, count) - -ssize_t readahead(int fd, off_t offset, size_t count) -{ - return __readahead(fd, offset, count); -} +_syscall3(ssize_t, readahead, int, fd, off_t, offset, size_t, count) # else -static __inline__ _syscall4(ssize_t, __readahead, int, fd, - off_t, high_offset, off_t, low_offset, size_t, count) - ssize_t readahead(int fd, off64_t offset, size_t count) { - return __readahead(fd, (off_t) (offset >> 32), (off_t) (offset & 0xffffffff), count); + return INLINE_SYSCALL(readahead, +# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) + 5, fd, 0, +# else + 4, fd, +# endif + OFF64_HI_LO(offset), count); } # endif -- cgit v1.2.3