Date: Fri, 17 Jun 2022 19:38:57 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: ac33f043f654 - stable/13 - linux(4): Cleanup empty lines. Message-ID: <202206171938.25HJcvIP015378@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=ac33f043f65437acbb5f868fafc412787b8df60a commit ac33f043f65437acbb5f868fafc412787b8df60a Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-03-31 18:23:12 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:33:48 +0000 linux(4): Cleanup empty lines. MFC after: 2 weeks (cherry picked from commit 09d60bfae58f10a24c8fc7c06bd3d90b86d40e07) --- sys/compat/linux/linux_common.h | 1 - sys/compat/linux/linux_emul.c | 1 - sys/compat/linux/linux_socket.c | 2 +- sys/compat/linux/linux_stats.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index c6837a6a3b52..0eb302bfcd17 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -45,5 +45,4 @@ void linux_to_bsd_poll_events(struct thread *td, int fd, short lev, short *bev); void bsd_to_linux_poll_events(short bev, short *lev); - #endif /* _LINUX_COMMON_H_ */ diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 1e8da643bb9a..08510fc29a3f 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -189,7 +189,6 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) pem->persona = 0; pem->oom_score_adj = 0; } - } void diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index d51b9945b434..453a6621d9a7 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -727,7 +727,7 @@ linux_copyout_sockaddr(const struct sockaddr *sa, void *uaddr, size_t len) error = bsd_to_linux_sockaddr(sa, &lsa, len); if (error != 0) return (error); - + error = copyout(lsa, uaddr, len); free(lsa, M_SONAME); diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index e01cb0c8d87a..fb2dd2fe01ef 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -800,4 +800,3 @@ linux_statx(struct thread *td, struct linux_statx_args *args) return (error); } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171938.25HJcvIP015378>