[git commit] linux: readahead: convert to SYSCALL_ALIGN_64BIT

[Mike Frysinger]

commit: http://git.uclibc.org/uClibc/commit/?id=81c9eaafecd4b3d53ef09931fe2c65de1cda98ca
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

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 <vapier at gentoo.org>
---
 libc/sysdeps/linux/common/readahead.c |   21 +++++++------------
 libc/sysdeps/linux/mips/Makefile.arch |    2 +-
 libc/sysdeps/linux/mips/readahead.c   |   35 ---------------------------------
 3 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/libc/sysdeps/linux/common/readahead.c b/libc/sysdeps/linux/common/readahead.c
index bbd9c0a..bda0de2 100644
--- a/libc/sysdeps/linux/common/readahead.c
+++ b/libc/sysdeps/linux/common/readahead.c
@@ -23,26 +23,21 @@
 # include <fcntl.h>
 # include <bits/wordsize.h>
 
-# 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
diff --git a/libc/sysdeps/linux/mips/Makefile.arch b/libc/sysdeps/linux/mips/Makefile.arch
index 00e3269..6d59b62 100644
--- a/libc/sysdeps/linux/mips/Makefile.arch
+++ b/libc/sysdeps/linux/mips/Makefile.arch
@@ -11,7 +11,7 @@ CSRC-y := \
 
 SSRC-y := bsd-_setjmp.S bsd-setjmp.S setjmp.S syscall.S pipe.S syscall_error.S
 
-CSRC-$(UCLIBC_LINUX_SPECIFIC) += cacheflush.c readahead.c sysmips.c
+CSRC-$(UCLIBC_LINUX_SPECIFIC) += cacheflush.c sysmips.c
 CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c posix_fadvise64.c
 SSRC-$(if $(UCLIBC_HAS_THREADS_NATIVE),,y) += vfork.S clone.S
 SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.S setcontext.S getcontext.S \
diff --git a/libc/sysdeps/linux/mips/readahead.c b/libc/sysdeps/linux/mips/readahead.c
deleted file mode 100644
index fa554f7..0000000
--- a/libc/sysdeps/linux/mips/readahead.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Provide kernel hint to read ahead.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sys/syscall.h>
-
-#if defined __NR_readahead && defined __UCLIBC_HAS_LFS__ && defined __USE_GNU
-# include <fcntl.h>
-# include <endian.h>
-
-ssize_t readahead(int fd, off64_t offset, size_t count)
-{
-# if _MIPS_SIM == _ABIO32
-	return INLINE_SYSCALL (readahead, 5, fd, 0,
-			       __LONG_LONG_PAIR ((off_t) (offset >> 32), (off_t) offset),
-			       count);
-# else /* N32 || N64 */
-	return INLINE_SYSCALL (readahead, 3, fd, offset, count);
-# endif
-}
-#endif