Date: Fri, 17 Jun 2022 19:41:01 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: fa085e417d01 - stable/13 - linux(4); Move vdso_selector_x86.c to the linux_common module Message-ID: <202206171941.25HJf1Q7029929@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=fa085e417d0131a8a6a41af2a9ab77f6860a12c5 commit fa085e417d0131a8a6a41af2a9ab77f6860a12c5 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-05-23 10:19:07 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:35:30 +0000 linux(4); Move vdso_selector_x86.c to the linux_common module MFC after: 2 weeks (cherry picked from commit 2b378d59a98a4eb1dab173c4db3b48f385c47728) --- sys/modules/linux/Makefile | 4 ++-- sys/modules/linux64/Makefile | 2 +- sys/modules/linux_common/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index be6231f767f1..46087dede53f 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -20,7 +20,7 @@ SRCS= linux_fork.c linux${SFX}_dummy_machdep.c linux_file.c linux_event.c \ opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \ device_if.h bus_if.h .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux_dummy_x86.c linux_vdso_selector_x86.c +SRCS+= linux_dummy_x86.c VDSODEPS=linux_vdso_gettc_x86.inc .endif .if ${MACHINE_CPUARCH} == "amd64" @@ -42,7 +42,7 @@ OBJS= linux${SFX}_vdso.so .if ${MACHINE_CPUARCH} == "i386" SRCS+= linux_ptrace_machdep.c imgact_linux.c linux_util.c linux_mib.c \ linux_mmap.c linux_dummy.c linux_emul.c linux_errno.c opt_cpu.h linux.c \ - linux_x86.c + linux_x86.c linux_vdso_selector_x86.c .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 63ddad878399..fd1363679513 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -15,7 +15,7 @@ SRCS= linux_elf64.c linux_fork.c linux_dummy_machdep.c linux_file.c \ vnode_if.h device_if.h bus_if.h \ linux_support.s .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux_dummy_x86.c linux_vdso_selector_x86.c +SRCS+= linux_dummy_x86.c .endif DPSRCS= assym.inc linux_genassym.c diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 033fabe27188..0c4983ef98ca 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -8,7 +8,7 @@ SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux_x86.c +SRCS+= linux_x86.c linux_vdso_selector_x86.c .endif EXPORT_SYMS=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171941.25HJf1Q7029929>