From patchwork Tue Jun 12 10:58:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 928265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 414n2W1FbXz9s1b for ; Tue, 12 Jun 2018 20:59:31 +1000 (AEST) Received: from localhost ([::1]:54465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSh1M-0003U5-M8 for incoming@patchwork.ozlabs.org; Tue, 12 Jun 2018 06:59:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSh0o-0003SU-JR for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSh0m-0007Dd-TO for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:58:54 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:48159) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSh0m-0007Cq-IS for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:58:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M6ydl-1gDeqx3XQT-00wlpE; Tue, 12 Jun 2018 12:58:39 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 12 Jun 2018 12:58:28 +0200 Message-Id: <20180612105831.25703-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180612105831.25703-1-laurent@vivier.eu> References: <20180612105831.25703-1-laurent@vivier.eu> X-Provags-ID: V03:K1:oOKE1MKTHUyBC4H/nTDC0//s239wcJwBi/xx+x4GoFQuHGpKY92 GRILmb8RUct9E8eUguHy0fd2yh8Vhrv9jPm770w94jeTzfrF2tJaCfzr4BkYv74T0GGmC0R 7XxD0e1Su+G+fKe0STaSuwbSbNaZF3IEhhO0cQz6ClX/56tQKB2XrPmZfwGVL8tWc9o88WS BD/XF7rcwfxlyDuRHWXkg== X-UI-Out-Filterresults: notjunk:1; V01:K0:jhw9VF2oNm8=:0L6476BOgerk2fgodsF2eW 4Zu0z//oBLeZ4GCRPEvHw2odxFnqqqmIdwg4CSV0T/wBJEBgpUe/xGmdwSLLvjcndeCOpEYi3 M3asRiIxAvgJ8ObcfeCsfhws7QMovxUlCmA9mbOrwM/5hkJiSBjxz9snPKp6YxAKdy+GZx6+h ghpIj+hw8s+MJ9cUDwYTPavP3b0Fxi14AK49TUm0pPpPuq9UX8fWo55+A58PbXkLSzeykOvD9 OMeyQm1IgQrYwLoTniohsIwzSbuy/ukHTel0e7tWjjWt9vkh7/Oez8PRHL2DkVqRRgEw7u3k9 +zGPVLO2JMQyqdmm41iKJXMUpNfn6fmW61dyOe1ut/Ouh7p9/7jT7sPr8tM2NYf1kIZXa2lXv pa0tLkWnwsl9Zjim4nAEOh2Ex8lv1IyFkGNcujfii7sSpkJt8iOVjZgCzEIVLODS1a+cK/GWD sB0cTb9gtcNwmzGa4KVaZHwkuNrHJ1XT+FbGzPyDPDuq13oC2APDD+B1wxyjxLxG7Jnzskk1C RdFj0Nqnt5qv2m/fSuMklOx6kOu0VHfmh4LAbsgE3jxvVzutQSkepwbRVVp0sKpx2TMTxo8uu 0d6GXMB+8YoEisMX1muq0OXMRsjpRBFiDM5MhuoVf02xMWPMyTH3l5CEtqzoIrSzLrbGQJ2iL wusPTs4EZXtf6h8o3Wo41hVeS+7fKFCCnuMXYpfsHUbtFEAi/hkE7XacBEMQbeOYh8GM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 5/8] linux-user/alpha: Fix epoll syscalls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson These were named incorrectly, going so far as to invade strace.list. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier Message-Id: <20180607184844.30126-2-richard.henderson@linaro.org> [lv: replace tabs by spaces] Signed-off-by: Laurent Vivier --- linux-user/alpha/syscall_nr.h | 6 +++--- linux-user/strace.list | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/linux-user/alpha/syscall_nr.h b/linux-user/alpha/syscall_nr.h index 00e14bb6b3..fbb1ed288b 100644 --- a/linux-user/alpha/syscall_nr.h +++ b/linux-user/alpha/syscall_nr.h @@ -343,9 +343,9 @@ #define TARGET_NR_io_cancel 402 #define TARGET_NR_exit_group 405 #define TARGET_NR_lookup_dcookie 406 -#define TARGET_NR_sys_epoll_create 407 -#define TARGET_NR_sys_epoll_ctl 408 -#define TARGET_NR_sys_epoll_wait 409 +#define TARGET_NR_epoll_create 407 +#define TARGET_NR_epoll_ctl 408 +#define TARGET_NR_epoll_wait 409 #define TARGET_NR_remap_file_pages 410 #define TARGET_NR_set_tid_address 411 #define TARGET_NR_restart_syscall 412 diff --git a/linux-user/strace.list b/linux-user/strace.list index a91e33f7e5..2bc5ba04d4 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1467,15 +1467,6 @@ #ifdef TARGET_NR__sysctl { TARGET_NR__sysctl, "_sysctl" , NULL, NULL, NULL }, #endif -#ifdef TARGET_NR_sys_epoll_create -{ TARGET_NR_sys_epoll_create, "sys_epoll_create" , NULL, NULL, NULL }, -#endif -#ifdef TARGET_NR_sys_epoll_ctl -{ TARGET_NR_sys_epoll_ctl, "sys_epoll_ctl" , NULL, NULL, NULL }, -#endif -#ifdef TARGET_NR_sys_epoll_wait -{ TARGET_NR_sys_epoll_wait, "sys_epoll_wait" , NULL, NULL, NULL }, -#endif #ifdef TARGET_NR_sysfs { TARGET_NR_sysfs, "sysfs" , NULL, NULL, NULL }, #endif