diff options
| author | dchagin <dchagin@FreeBSD.org> | 2016-01-09 16:11:09 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2016-01-09 16:11:09 +0000 |
| commit | 6c12e20ac1e5ea5573246049365409feabb20095 (patch) | |
| tree | faa5068ff72fa5ba5e4a549a627a6eb1509ad298 /sys/modules | |
| parent | d30e84112a87337209ea45237f3d9b12e29abaa9 (diff) | |
| download | FreeBSD-src-6c12e20ac1e5ea5573246049365409feabb20095.zip FreeBSD-src-6c12e20ac1e5ea5573246049365409feabb20095.tar.gz | |
MFC r283422:
Refund the proc emuldata struct for future use. For now move flags from
thread emuldata to proc emuldata as it was originally intended.
As we can have both 64 & 32 bit Linuxulator running any eventhandler
can be called twice for us. To prevent this move eventhandlers code
from linux_emul.c to the linux_common.ko module.
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/linux/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/linux_common/Makefile | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 1e8fda1..5817aab 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -10,7 +10,7 @@ CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 VDSO= linux${SFX}_vdso KMOD= linux -SRCS= linux_fork.c linux${SFX}_dummy.c linux_emul.c linux_file.c \ +SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.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 \ @@ -30,7 +30,8 @@ SRCS+= opt_apic.h OBJS= ${VDSO}.so .if ${MACHINE_CPUARCH} == "i386" -SRCS+= linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c opt_cpu.h +SRCS+= linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c \ + linux_emul.c opt_cpu.h .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 4384d0b..ebc475d 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../compat/linux KMOD= linux_common -SRCS= linux_common.c linux_mib.c linux_util.c \ +SRCS= linux_common.c linux_mib.c linux_util.c linux_emul.c \ opt_compat.h device_if.h vnode_if.h bus_if.h EXPORT_SYMS= |
