Date: Wed, 31 Jul 2024 18:27:47 GMT From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: fb084dd01e25 - stable/14 - Fix mismerge in lib/libthr/arch/riscv/include/pthread_md.h Message-ID: <202407311827.46VIRlZo075000@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=fb084dd01e25b7fa743e55dac40a0af29b6ea14d commit fb084dd01e25b7fa743e55dac40a0af29b6ea14d Author: Michal Meloun <mmel@FreeBSD.org> AuthorDate: 2024-07-31 18:19:38 +0000 Commit: Michal Meloun <mmel@FreeBSD.org> CommitDate: 2024-07-31 18:27:05 +0000 Fix mismerge in lib/libthr/arch/riscv/include/pthread_md.h Fixes: bd774d7aa1117f531b2894a6428aa2792f7bedc8 --- lib/libthr/arch/riscv/include/pthread_md.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libthr/arch/riscv/include/pthread_md.h b/lib/libthr/arch/riscv/include/pthread_md.h index 2f70aa5edf25..baddfe3ecb22 100644 --- a/lib/libthr/arch/riscv/include/pthread_md.h +++ b/lib/libthr/arch/riscv/include/pthread_md.h @@ -61,9 +61,4 @@ _thr_resolve_machdep(void) { } -static __inline void -_thr_resolve_machdep(void) -{ -} - #endif /* _PTHREAD_MD_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407311827.46VIRlZo075000>