Date: Thu, 10 Jun 2021 09:31: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: bb687ce01268 - stable/12 - Fix i386 linux module after r367395. Message-ID: <202106100931.15A9V1l6030484@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bb687ce0126833710ac5fc9a9d80240e94735df6 commit bb687ce0126833710ac5fc9a9d80240e94735df6 Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2020-12-05 14:53:24 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2021-06-10 09:24:32 +0000 Fix i386 linux module after r367395. In r367395 parts of machine dependent linux_dummy.c were moved to a new machine independent file sys/compat/linux/linux_dummy.c and the existing linux_dummy.c was renamed to linux_dummy_machdep.c. Add linux_dummy_machdep.c to the linux module for i386. Rename sys/amd64/linux32/linux_dummy.c for consistency. Add the new linux_dummy.c to the linux module for i386. (cherry picked from commit df4ca45cf943fb62c7771e479f5f999570ec6928) --- sys/amd64/linux32/{linux32_dummy.c => linux32_dummy_machdep.c} | 0 sys/conf/files.amd64 | 2 +- sys/modules/linux/Makefile | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy_machdep.c similarity index 100% rename from sys/amd64/linux32/linux32_dummy.c rename to sys/amd64/linux32/linux32_dummy_machdep.c diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 5effa0f5f9c6..c49728bff1aa 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -708,7 +708,7 @@ compat/linsysfs/linsysfs.c optional linsysfs # # Linux/i386 binary support # -amd64/linux32/linux32_dummy.c optional compat_linux32 +amd64/linux32/linux32_dummy_machdep.c optional compat_linux32 amd64/linux32/linux32_machdep.c optional compat_linux32 amd64/linux32/linux32_support.s optional compat_linux32 \ dependency "linux32_assym.h" diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 3092c5d81d80..0cf780106be7 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -13,7 +13,7 @@ CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 VDSO= linux${SFX}_vdso KMOD= linux -SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.c linux_event.c \ +SRCS= linux_fork.c linux${SFX}_dummy_machdep.c linux_file.c linux_event.c \ linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux${SFX}_machdep.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ @@ -41,7 +41,7 @@ OBJS= ${VDSO}.so .if ${MACHINE_CPUARCH} == "i386" SRCS+= linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c linux_mmap.c \ - linux_emul.c linux_errno.c opt_cpu.h linux.c + linux_dummy.c linux_emul.c linux_errno.c opt_cpu.h linux.c .endif .if ${MACHINE_CPUARCH} == "i386"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106100931.15A9V1l6030484>