From nobody Wed May 11 18:01:50 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 78C8B1AC3B2C;
	Wed, 11 May 2022 18:01:50 +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 4Kz2mG2L1yz4WfR;
	Wed, 11 May 2022 18:01:50 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1652292110;
	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=mRn3Z6QqDpvk95AwZ4h/YWoOepJIr9bwfD0Sez3gMWU=;
	b=d2SrT5GlX9YdePKuJfEX505LqK7P0u3Ejtx43tqdPfgcEvbIZnEaNp+9Wra81xPNeXppFK
	NlTc0220Eas5Ra0Cn9xCtjLzTGkn5+sfxKy4arocu7I3tCXFBNh/Qn6oPaZvcCe8wDMz6t
	MICa7jjlAXDH281H6EvFAVAuQOIw9cGAdqsrHg0ljHcFtZY0GpDU51iuR9bvH8qPJrRy0B
	n6ZQpvcA5wIb+Z/SXm0tzTq444+nOC70XCyq9lGMFyylmGFOIZzd3lP3z0BO61574w79vH
	i2TlVys34FPblN9m+Hhlff7GnAlh8LlxspJGD9ttkn4QyrP6Ll+uYq2O5kWeRA==
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 30D691E5C2;
	Wed, 11 May 2022 18:01:50 +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 24BI1oLF081290;
	Wed, 11 May 2022 18:01:50 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24BI1okc081289;
	Wed, 11 May 2022 18:01:50 GMT
	(envelope-from git)
Date: Wed, 11 May 2022 18:01:50 GMT
Message-Id: <202205111801.24BI1okc081289@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Dmitry Chagin <dchagin@FreeBSD.org>
Subject: git: 5326ebfd05c5 - main - linux(4): Revert c7ef7c3 as it's wrong at all.
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/main
X-Git-Reftype: branch
X-Git-Commit: 5326ebfd05c57b9432cb1ea7268f789559ba1e25
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1652292110;
	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=mRn3Z6QqDpvk95AwZ4h/YWoOepJIr9bwfD0Sez3gMWU=;
	b=LqvBa8fUi4oBeFE/YuuugynDdjVFT9/lg692zEbiIKOoPFaT+8it7kPJfD6EHyJOPm5P7T
	+4jlmvQzjhnYm16caVvzsixA1sXl20hJBhCjW1d/cLf26GQtu3ptpd0I1li7nvN9Bi6YVC
	OCB6YRMopWNDi2FbehPIXPXZoouMLgtuNrYOW3LGyqqgHuV7lRs22cWHrTPbzbdKby98Kg
	owABpKyBNpTBedZQceCy0fVyXEfdKsF+FOyg4g5OcWcwYp1p9rwcWZYUlAczbLBTcUMZz8
	wazQl9bXQQ40+nUlY5PwR9SRVhi1v8UlYoKHgiRrmnsP87S1uk8YnUmpkSCGDg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652292110; a=rsa-sha256; cv=none;
	b=gSXXenwZRldTMr6qSIj4KjfnBEE913OaHDQouTBF81xMCWnog2EqJYvCTUHYsu2opFqF8l
	MLOKAnBC3BZCvq7sUVtRzCLF4OICmiWKyZiP59ySSCUpIO44fHfhEIbANpDUOgLJyKdaDF
	21D0tYJV3U3j8R8JjdGBXY0qcDsuKIWZ0d0A++b902qDExzcRpgLrZxW+UfLAfui7WndnC
	wwxNaBO6rbmF3Ar9vffjwB8eQubCd8ILA+ZrXeMXfsT/HZ31KmyN/T5VPJboi50USbz0dM
	n7+PHRPUhJU8dxt160SN2RaWvHwcJ2OvEG7O30T+dv2gq4AM5EmPl2Vxu7o1tg==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=5326ebfd05c57b9432cb1ea7268f789559ba1e25

commit 5326ebfd05c57b9432cb1ea7268f789559ba1e25
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2022-05-11 18:00:54 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-05-11 18:00:54 +0000

    linux(4): Revert c7ef7c3 as it's wrong at all.
    
    Reported by:            trasz
---
 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 e9d29ec57436..d8687945b0e8 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) {