Date: Fri, 17 Jun 2022 19:40:07 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: f360bdf68de9 - stable/13 - linux(4): Refactor vdso_gettc_x86 includes. Message-ID: <202206171940.25HJe7la019713@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=f360bdf68de9cc9b201e9609ac7c7190ed5e4512 commit f360bdf68de9cc9b201e9609ac7c7190ed5e4512 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-05-08 14:20:51 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:34:59 +0000 linux(4): Refactor vdso_gettc_x86 includes. Factor out includes from common vdso_gettc_x86 file to the corresponding MD files. MFC after: 2 weeks (cherry picked from commit 332eca05b557f4f9d108480688d9c0933f6ed06b) --- sys/amd64/linux/linux_vdso_gtod.c | 1 + sys/amd64/linux32/linux32_vdso_gtod.c | 5 +++-- sys/i386/linux/linux_vdso_gtod.c | 1 + sys/x86/linux/linux_vdso_gettc_x86.inc | 13 ------------- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index 57d3f4b45dd4..65e45ce29505 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <stdbool.h> #include <machine/atomic.h> +#include <machine/cpufunc.h> #include <machine/stdarg.h> #include <amd64/linux/linux.h> diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 0caf787c9503..bbe15e462c09 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$"); #undef _KERNEL #include <stdbool.h> -#include <machine/atomic.h> -#include <machine/stdarg.h> +#include <i386/include/atomic.h> +#include <i386/include/cpufunc.h> +#include <i386/include/stdarg.h> #include <amd64/linux32/linux.h> #include <amd64/linux32/linux32_syscall.h> diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index 046b864c54f5..8619a21cd3f4 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <stdbool.h> #include <machine/atomic.h> +#include <machine/cpufunc.h> #include <machine/stdarg.h> #include <i386/linux/linux.h> diff --git a/sys/x86/linux/linux_vdso_gettc_x86.inc b/sys/x86/linux/linux_vdso_gettc_x86.inc index ade78a03486b..11c2a531e97e 100644 --- a/sys/x86/linux/linux_vdso_gettc_x86.inc +++ b/sys/x86/linux/linux_vdso_gettc_x86.inc @@ -30,19 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> - -#if defined(__i386__) || defined(COMPAT_LINUX32) -#include <i386/include/atomic.h> -#include <i386/include/cpufunc.h> -#else -#include <amd64/include/atomic.h> -#include <amd64/include/cpufunc.h> -#endif - static inline u_int rdtsc_low(const struct vdso_timehands *th) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171940.25HJe7la019713>