From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtPiI-0007Cu-14 for qemu-devel@nongnu.org; Thu, 10 Jan 2013 16:31:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtPiG-0006Hv-Aw for qemu-devel@nongnu.org; Thu, 10 Jan 2013 16:31:01 -0500 Received: from smtp6-g21.free.fr ([2a01:e0c:1:1599::15]:60643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtPiF-0006Hl-Na for qemu-devel@nongnu.org; Thu, 10 Jan 2013 16:31:00 -0500 From: Laurent Vivier Date: Thu, 10 Jan 2013 22:30:50 +0100 Message-Id: <1357853450-10445-1-git-send-email-laurent@vivier.eu> In-Reply-To: <1357598314-21156-1-git-send-email-laurent@vivier.eu> References: <1357598314-21156-1-git-send-email-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH][v2] linux-user,alpha: correct select() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: Riku Voipio , qemu-devel@nongnu.org, Laurent Vivier Signed-off-by: Laurent Vivier --- v2: remove unused TARGET_S390 and simplify ifdefs linux-user/syscall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 94f79dd..693e66f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6227,8 +6227,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = get_errno(settimeofday(&tv, NULL)); } break; -#if defined(TARGET_NR_select) && !defined(TARGET_S390X) && !defined(TARGET_S390) +#if defined(TARGET_NR_select) case TARGET_NR_select: +#if defined(TARGET_S390X) || defined(TARGET_ALPHA) + ret = do_select(arg1, arg2, arg3, arg4, arg5); +#else { struct target_sel_arg_struct *sel; abi_ulong inp, outp, exp, tvp; @@ -6244,6 +6247,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, unlock_user_struct(sel, arg1, 0); ret = do_select(nsel, inp, outp, exp, tvp); } +#endif break; #endif #ifdef TARGET_NR_pselect6 @@ -7167,12 +7171,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } break; #endif /* TARGET_NR_getdents64 */ -#if defined(TARGET_NR__newselect) || defined(TARGET_S390X) -#ifdef TARGET_S390X - case TARGET_NR_select: -#else +#if defined(TARGET_NR__newselect) case TARGET_NR__newselect: -#endif ret = do_select(arg1, arg2, arg3, arg4, arg5); break; #endif -- 1.7.10.4