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: 138312 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5192853lji; Tue, 12 Jun 2018 03:59:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKBKyj8x0v5llPAbifzBkz2s0yCqutG/EOFrA9iCPDvcPjKiuwbyi6bhWCMwkUYRcBZjJ6M X-Received: by 2002:a0c:8b4b:: with SMTP id d11-v6mr2783900qvc.241.1528801156711; Tue, 12 Jun 2018 03:59:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528801156; cv=none; d=google.com; s=arc-20160816; b=pfT96eRLe6WOGCLOxaIn3suugevJSeEVOWP7VgzUjbUdVjABEHXM2lrHxN6bwrYSr0 Eo7pBgmoAKajPh8o1YCXqR/0sc4B7LqhTP/cEfvFHp41+qqIYsVIIhBwhpTti45dQmUc UFowkb/fld0l+qKXkgktVFpcIMzDVHd3DuFzvitVuZGbUV5RrCOHqovB2w66Lep9BX1X QflIDK+rLatEqj9C1t2owZN5AyHrZDL+6gwBba1Fj/DEczEG64PvcILH95CZSP1L4Tl7 9GEsFZQqx3D1LrVniNc+75EspnP1H0hP3Fg3ZcK6V8YJjRrhcWeENH5WGZngFHGOLzNm CFRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=AQjj9MJ2lpsZXslb95r6GFoRgOluDJ+6v9xHWp363B0=; b=wXo110+BF4+rBu/FXFcKTnIpiSMg0sBwH29ziGdx6nw66Mz3W9PzbJ1yedlheiybTH c+iRnrwOfcNBoJNmB4Urm+YqaPzJNmgq6umv9O3m9BSutesxuEEN8mYVVlKBuq14moGQ s8Kk2doS2i0r2m7RGK++Lch2fZxuFKodlX82Ftc30LcNYu1XleBznBRqKbBWgdOF1oXn yrn75EQPB/96I04uRYVPveMIZixcpjA0EtzoOsJE5dFbbKBUYM2eeSHKshfX1jmgwnYX NJVGbJMQs5OavZXCv463dPTUC8bqL+QuttpgPkgx3JLgzMB4kqHCvgPJVXI+0Rpfoomx fWUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o34-v6si577370qtc.295.2018.06.12.03.59.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Jun 2018 03:59:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:54465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSh1A-0003U5-7C for patch@linaro.org; Tue, 12 Jun 2018 06:59:16 -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+patch=linaro.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(-) -- 2.14.4 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