The branch main has been updated by dchagin:

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

commit 5326ebfd05c57b9432cb1ea7268f789559ba1e25
Author:     Dmitry Chagin <[email protected]>
AuthorDate: 2022-05-11 18:00:54 +0000
Commit:     Dmitry Chagin <[email protected]>
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) {

Reply via email to