Date: Fri, 17 Jun 2022 19:40:22 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0e89b88d1c46 - stable/13 - linux(4): Revert c7ef7c3 as it's wrong at all. Message-ID: <202206171940.25HJeMv5025640@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0e89b88d1c46e44b956532ec05de78ad087ac227 commit 0e89b88d1c46e44b956532ec05de78ad087ac227 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-05-11 18:00:54 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171940.25HJeMv5025640>