From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37422 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKcMI-0004JF-Ns for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:15:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKcMH-00028g-FW for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:15:10 -0400 Received: from are.twiddle.net ([75.149.56.221]:54743) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKcMG-00028I-Om for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:15:09 -0400 From: Richard Henderson Date: Fri, 4 Jun 2010 12:14:10 -0700 Message-Id: <1275678883-7082-3-git-send-email-rth@twiddle.net> In-Reply-To: <1275678883-7082-1-git-send-email-rth@twiddle.net> References: <1275678883-7082-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 02/35] s390x: Avoid _llseek. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, aurelien@aurel32.net There's no _llseek on s390x either. Replace the existing test for __x86_64__ with a functional test for __NR_llseek. Signed-off-by: Richard Henderson --- linux-user/syscall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8222cb9..e94f1ee 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -208,7 +208,7 @@ _syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count) _syscall3(int, sys_getdents64, uint, fd, struct linux_dirent64 *, dirp, uint, count); #endif _syscall2(int, sys_getpriority, int, which, int, who); -#if defined(TARGET_NR__llseek) && !defined (__x86_64__) +#if defined(TARGET_NR__llseek) && defined(__NR_llseek) _syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh); #endif @@ -5933,7 +5933,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef TARGET_NR__llseek /* Not on alpha */ case TARGET_NR__llseek: { -#if defined (__x86_64__) +#if !defined(__NR_llseek) ret = get_errno(lseek(arg1, ((uint64_t )arg2 << 32) | arg3, arg5)); if (put_user_s64(ret, arg4)) goto efault; -- 1.7.0.1