From nobody Fri Jun 17 19:40:22 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 581A285CEBC; Fri, 17 Jun 2022 19:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPqBt5Dr2z3hKx; Fri, 17 Jun 2022 19:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZ/7m99jd+mL/hZyDrQ9A2qIXLj7d4FbU4/fh+8JmH0=; b=dUv5bFirCm5ZkqDFRCYQC4h6EIFMm9lItyDQYX4AQp6G8wcvE7S4Mb0IoIibrGATvSIkLK t0y7WJdXnFyF68C4iZ7gvURf+luy4dfUC2mEbfdrz+FY3zWSHa5YP0KWISjxOi4JKPNvES Mwv5h/E1DPUSl00csKPr0iEi8SCqM0hvkLk9zPT45vExOAxrz+i0aePjzuWvu3N8iRsGEG i1Vwy84kh1ugf+0MWUdagBSieaj0tXZFSfjEnFodww9EJKt3d2Bum1mA67iEndDF7lsAw6 6SqlPhUK9Obg6AsnKipnhEJ9qIVrqRZPuF3C0pGoRpMbWnDhqfI6CvD1+F2Gew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F4D125D9D; Fri, 17 Jun 2022 19:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJeM71025643; Fri, 17 Jun 2022 19:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeMv5025640; Fri, 17 Jun 2022 19:40:22 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:22 GMT Message-Id: <202206171940.25HJeMv5025640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 0e89b88d1c46 - stable/13 - linux(4): Revert c7ef7c3 as it's wrong at all. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e89b88d1c46e44b956532ec05de78ad087ac227 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZ/7m99jd+mL/hZyDrQ9A2qIXLj7d4FbU4/fh+8JmH0=; b=bY3ji5U8xQdB9VRKYY9Xw59gV9UXHr2Iu7r3BYf4bvdPAehHV9ZBzEvu7D/StZqwETZ5k1 rbrFRkenjsBTt9EaO99/nlFwnwh2ewpDq4+rWge+uR7QhNWEoCSX4di/zmRrBGu8R1OXn2 IxV5FATZIpErfrAipHatSiFDoBArBLbvmx8R1K4xef+cby/jibsGt5lUW4oROFlBLbpUbb iJVIHaDj2IdRyyNS4XRG+t7uckYQc5qwBy7PzFPRDT3gb/wI9yLKP4Qes2EFU3PnbSIET4 Idf4zJAtzk61AwSbPgRsaOr77pJluiRqZqAnJ3Yjy0poIyGt/nyYl2Tow4yKIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494823; a=rsa-sha256; cv=none; b=AW9bEKxVOM+3BNNjz2fkNirTuEwwEGYe9ue8cebPtOK7aqrEHQOvmbS/jn96Vd1+ZZMjfz 8PqJxy33DK+Q3g5g/5MoWlKg0wT6I3X/wqNM4BAVKEX5UtY4VmGEDQPS2qinIGIX9vEgVB a4BAi3/tgydyRDQBIk4lZT39BGhEf7PFAbf4Fc+QhMCMoi/Ud/QIJF9kUZNzw47wQP7v8G lK8/edMGcRfMnqVEaCLtUF80RkqlS8hKsi3ccYbjEtoTMlj/wJHGkYCD78yH9ELcJR6lbZ YaO71ooS7LLipsvBh65weyfgP6kBcgLpsFnbfrKmkejdYQmpxxCCCiIwyGeDVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0e89b88d1c46e44b956532ec05de78ad087ac227 commit 0e89b88d1c46e44b956532ec05de78ad087ac227 Author: Dmitry Chagin AuthorDate: 2022-05-11 18:00:54 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:15 +0000 linux(4): Revert c7ef7c3 as it's wrong at all. Reported by: trasz (cherry picked from commit 5326ebfd05c57b9432cb1ea7268f789559ba1e25) --- sys/compat/linux/linux_misc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 9328755a7130..55a16d13e400 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1076,14 +1076,6 @@ linux_wait4(struct thread *td, struct linux_wait4_args *args) */ options |= WEXITED | WTRAPPED; - /* - * As FreeBSD does not have __WALL option bit analogue explicitly set all - * possible option bits to emulate Linux __WALL wait option bit. The same - * for waitid system call. - */ - if ((args->options & __WALL) != 0) - options |= WUNTRACED | WCONTINUED | WLINUXCLONE; - if (args->pid == WAIT_ANY) { idtype = P_ALL; id = 0; @@ -1119,9 +1111,6 @@ linux_waitid(struct thread *td, struct linux_waitid_args *args) options = 0; linux_to_bsd_waitopts(args->options, &options); - if ((args->options & __WALL) != 0) - options |= WEXITED | WTRAPPED | WUNTRACED | - WCONTINUED | WLINUXCLONE; id = args->id; switch (args->idtype) {