From patchwork Tue Jun 12 00:51:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138268 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4698644lji; Mon, 11 Jun 2018 17:54:47 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL+viEgn4+5m4f8GptYAtSPpzKhVod8iGkkV4PsuyK9I46XlHF2J1+Em4s77ZUivpZgwGgE X-Received: by 2002:a37:e304:: with SMTP id y4-v6mr1363327qki.404.1528764887736; Mon, 11 Jun 2018 17:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528764887; cv=none; d=google.com; s=arc-20160816; b=C7YKEUJWuw3cieEEW+AQSQZV/4+nsMFLA9Eyi9DXav0csgOcK5USg7kFzF8FtKbV+B +JPcEXCiBCjsXzJ8bruA3qdyoTJMr1UULqHx0J8ocRCosfkwLaqRE0y31e2441xpcqqw gFKRF4Zr7r9yCdIUV5am0YKQ2J1mnIbeBLYvIWGaYVxcMKTk0dm56wMI5GZq/Lo0gahM dfU1E9AjgQH94Fk0y5/QA/b63c0L/mAoCKw/FeXt7nUxK35PoyldkvwmkmOnyXYQ5V/9 qtAOC2Ld9S0Hoq/jR8gWh9Nh2+JQllb1Y2zxNtx+O+bZYaQpCI3UmLP6CD9zpBFZS0JT gq8Q== 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:dkim-signature:arc-authentication-results; bh=rviYFsof95lmFcbw0gKrsQLP8oCHpKimHJgbRIl8V0A=; b=tHDAQ5GCnQBRCNlYACDGmR65FRHSsS32evQZDMpZjJs8IDvOzNJZGRPtwgdTym3QAc rXyWRWOEH3bom+2kySbZADjoH78435VIQdsSxdSqwN300ZuZc3V7NI1k7Y7dPE5PVn8w 8u0zfdkmFrKSjK7e43E9kKSsIySYjQheT2XJfb4Lyjbxb2PMTGuYEMR2teS7sexgpNYD hL/Mcg0Xcs9agDhrI90nymVbAxVllxl3XlQZKYHPgqAvPZAVMANMLw2oiwco9Jf5RcGo 4IsrCyC4XqGwSs2CjaD+ZhCpBZaPeD32EjKsEzPiGVZVEaX5nR9pKRAX3Zhu5sezXZET dwTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KIhemeFm; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u1-v6si13399541qkd.91.2018.06.11.17.54.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Jun 2018 17:54:47 -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; dkim=fail header.i=@linaro.org header.s=google header.b=KIhemeFm; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSXaB-0007Dm-5j for patch@linaro.org; Mon, 11 Jun 2018 20:54:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSXXQ-0004vA-4L for qemu-devel@nongnu.org; Mon, 11 Jun 2018 20:51:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSXXO-0007Cr-6g for qemu-devel@nongnu.org; Mon, 11 Jun 2018 20:51:56 -0400 Received: from mail-pl0-x22e.google.com ([2607:f8b0:400e:c01::22e]:43833) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSXXO-0007CK-0m for qemu-devel@nongnu.org; Mon, 11 Jun 2018 20:51:54 -0400 Received: by mail-pl0-x22e.google.com with SMTP id c41-v6so13310160plj.10 for ; Mon, 11 Jun 2018 17:51:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rviYFsof95lmFcbw0gKrsQLP8oCHpKimHJgbRIl8V0A=; b=KIhemeFmD1tttu5okXtiGcuWnVLhSEFCu5lCLa4SeXoFi9rTm6rUBCXrx6/Ev2tpiH JYbwsgVe1iVWyQ/NkWJ5HHM9zzkgWj0L34NQIEiYR4fm55k4SqYTIZ6dOXDNfAigv4mc yPTCdQ1/NoxK67b5na1PGJnl4vamQGvEX3QHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rviYFsof95lmFcbw0gKrsQLP8oCHpKimHJgbRIl8V0A=; b=a6SzJWopUkSlFrDAfYsogroozSyiPNZnXdg5ktRyJI3P+uBZu7gkznKZlMmSX1smDK XRn6xxj0TaZZNchuPsqb27u/5K3bgu/60X9VojTrxuIofu4oncj5cfWtw2ZeU3JZi1go E1/X20czl7ePkhAxpzkmf+Zh0Y3L1HgnJY5p0n6uO+3aYcDMruK6qliA2CsuW6z7TQB1 Xq+Lk7MAs8jalRyFjBp6eLc7NLObarZ+708mDyMTDjJEjPwtpa2xB6Yv6/6OSQ44yNWG q27c1HRPd7Y1UkthH9hrdxE5v974AUVoEQcHux1pIhxxViwC/lFbaiPjJTD9yUVZ/dM8 P1fQ== X-Gm-Message-State: APt69E0z+Q9eEZTp0iyQZwCbZPtzuCpGCrLPLgxKWi4BW73k6gvDbhKr DDXu4jLqae7GB8TDzmD750jPvTK9xaE= X-Received: by 2002:a17:902:7442:: with SMTP id e2-v6mr1557955plt.28.1528764712771; Mon, 11 Jun 2018 17:51:52 -0700 (PDT) Received: from cloudburst.twiddle.net (rrcs-173-198-77-219.west.biz.rr.com. [173.198.77.219]) by smtp.gmail.com with ESMTPSA id l26-v6sm43362802pgn.55.2018.06.11.17.51.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 17:51:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Jun 2018 14:51:27 -1000 Message-Id: <20180612005145.3375-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612005145.3375-1-richard.henderson@linaro.org> References: <20180612005145.3375-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22e Subject: [Qemu-devel] [PATCH v3 01/19] 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: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These were named incorrectly, going so far as to invade strace.list. Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- linux-user/alpha/syscall_nr.h | 6 +++--- linux-user/strace.list | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/linux-user/alpha/syscall_nr.h b/linux-user/alpha/syscall_nr.h index 00e14bb6b3..6532376e3e 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