From patchwork Sun Jun 10 03:02:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138176 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp2616145lji; Sat, 9 Jun 2018 21:18:13 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIP5B1ZF7+uDbPS1ZbJ9dpfDg371a/EQNtTF7PivQZdcsiXTT7LL28O2gfaC5gJ3UY8Qbj3 X-Received: by 2002:ac8:1692:: with SMTP id r18-v6mr11428288qtj.206.1528604293503; Sat, 09 Jun 2018 21:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528604293; cv=none; d=google.com; s=arc-20160816; b=uFN4yRKswirDrHScKCPVmBo+UBdmqjOT/pPBHgexJbgz5O28guMngBY7XEdQ3k9mIL PCpfdpyWWG/wgOIEU784Dc0KdMhhxlZavG8gD1YbNnDVfYry2wqGpzZ9fP0AJpJERw6a bfZIKJhd5HOe3BCIwI8VdcKzw6iFswAQyYuiXMea1OCVzMa36TlolsXWb2plVHZnRBkg woDq+kxHix5bVbKKB9crc6gqLYJZaNww5kz1G8rYaND/AT8yaG3n1JXw0n6cf/tDuTyj FTP/Sl9uUrYv6JwSvO5jw2UmHrwXWFmYQX8EkbkgAKS8DtNz1kLBf9CvuTC1fgx9bX77 /0PA== 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=QlVeTj1rlHQ3B8Bg6f76ot99hBRRJdf8tWoYw/ajFPU=; b=Zsn5qsMrfy5qydj7HHHE1spljipCsDUHydx93fL8zTg1nS2Z8i3Ge8MG1sqqAeIpJ0 pOOL97umx1TM12snlqLuSp+27i33aptXE5R5KyR4DXc/fEVfQlNtKF4QGk4RICaEyrYm HFT1PshIOWaAka6gKN6+sbLGMu2j8FlOrU6hrtVOISyheuTj4XLNF6pwkoo8yrPgoWgn yk8GXWtnc6jEyEDMmNxVdoAQebfTLnYlRtAJV51rmjpSrExlvqCHY9crTgqEqo/QBL9J rwUk1uxy5My5Awx2zbdY4FR8kg1ydrzjCC2IvBcYiRb5rzvvkcFAUDjGiPQYaLngzY6O cyVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P4EhAJEW; 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 o133-v6si5182609qke.209.2018.06.09.21.18.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 09 Jun 2018 21:18:13 -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=P4EhAJEW; 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]:42599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRrnx-0003bp-0G for patch@linaro.org; Sun, 10 Jun 2018 00:18:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRqfm-0004QN-26 for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:05:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRqfj-0004gd-AB for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:05:42 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:42524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRqfj-0004gJ-5O for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:05:39 -0400 Received: by mail-pg0-x241.google.com with SMTP id c10-v6so2509671pgu.9 for ; Sat, 09 Jun 2018 20:05:39 -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=QlVeTj1rlHQ3B8Bg6f76ot99hBRRJdf8tWoYw/ajFPU=; b=P4EhAJEWXOpjZezoXPqWzZx8wc/6s4NUU/Ka5N41b2F5HnfUINzwZfqFG6evgMine/ scdSvjll82KrE8pouKbEfYcVz5gHcvozrJTM0pZxDB/A/mHwJTRiuv4H4huWSKF3T4ik YxChzumpoP7vxg4Dy4l+mLaP6NHWEiQRF2Dw4= 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=QlVeTj1rlHQ3B8Bg6f76ot99hBRRJdf8tWoYw/ajFPU=; b=aSYejBCO3fwKeVHhsgBymxmtdw8Ka0KZM6O1vL/6mkl0oT6BSo4CzIGQdFKYIxWNC+ VkBSUsk45zcB48CsfM6wQRLrPAuhZmVESH40ag8gHmeTi1bSV+dKh8tAfB6+XTbj1Lfq GKEUmNrlCsx8jemSh92xN/DMi7p2JUtqyeGuXOin88r3JxIeDoo2Abf6APrJJ/b6/s33 5MM+kiLy2Rg9SRMauoy+hU6lNxd3BJMbjqP8mLoQJP4zQzFDPfFz6VnIOElhJHQR9CHm EFXmqnX9lzk650sFyFNTJgc8vazm7qy2NKMDNIyoSGqxS464fCfbB9uBG0hpYNsvm/x6 cO9Q== X-Gm-Message-State: APt69E0aZP576V36nofL+wx4c00jfD+LimUCgY7s1scOzRyJH/FIQhtJ U7ayDqRYfipJ5oE+uprTFcbO4x8FPm4= X-Received: by 2002:a62:cc51:: with SMTP id a78-v6mr12097455pfg.219.1528599937941; Sat, 09 Jun 2018 20:05:37 -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 y17-v6sm31712718pfe.33.2018.06.09.20.05.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Jun 2018 20:05:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 9 Jun 2018 17:02:05 -1000 Message-Id: <20180610030220.3777-94-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180610030220.3777-1-richard.henderson@linaro.org> References: <20180610030220.3777-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:c05::241 Subject: [Qemu-devel] [PATCH v2 093/108] linux-user: Remove sys_futex 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: laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can use safe_futex in the one place that used sys_futex; no need to define them both. Signed-off-by: Richard Henderson --- linux-user/syscall.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 800b79276f..95b30adea2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -235,7 +235,6 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ #define __NR_sys_rt_sigqueueinfo __NR_rt_sigqueueinfo #define __NR_sys_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo #define __NR_sys_syslog __NR_syslog -#define __NR_sys_futex __NR_futex #define __NR_sys_inotify_init __NR_inotify_init #define __NR_sys_inotify_add_watch __NR_inotify_add_watch #define __NR_sys_inotify_rm_watch __NR_inotify_rm_watch @@ -282,10 +281,6 @@ _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) _syscall1(int,exit_group,int,error_code) #endif _syscall1(int,set_tid_address,int *,tidptr) -#if defined(TARGET_NR_futex) && defined(__NR_futex) -_syscall6(int,sys_futex,int *,uaddr,int,op,int,val, - const struct timespec *,timeout,int *,uaddr2,int,val3) -#endif #define __NR_sys_sched_getaffinity __NR_sched_getaffinity _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len, unsigned long *, user_mask_ptr); @@ -8079,8 +8074,8 @@ IMPL(exit) TaskState *ts = cpu->opaque; if (ts->child_tidptr) { put_user_u32(0, ts->child_tidptr); - sys_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX, - NULL, NULL, 0); + safe_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX, + NULL, NULL, 0); } thread_cpu = NULL; object_unref(OBJECT(cpu));