summaryrefslogtreecommitdiffstats
path: root/sys/modules/linux
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2015-05-24 15:54:58 +0000
committerdchagin <dchagin@FreeBSD.org>2015-05-24 15:54:58 +0000
commitf18b3d51fa76d8d28f216bd46d2f0a5088cfc570 (patch)
tree35b3b7280c8c40a1e2ee373c55b63a07ecb0a7ea /sys/modules/linux
parentb08f3f43f9e901fdb2194f84eb02093e60665bab (diff)
downloadFreeBSD-src-f18b3d51fa76d8d28f216bd46d2f0a5088cfc570.zip
FreeBSD-src-f18b3d51fa76d8d28f216bd46d2f0a5088cfc570.tar.gz
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. Differential Revision: https://reviews.freebsd.org/D1073
Diffstat (limited to 'sys/modules/linux')
-rw-r--r--sys/modules/linux/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 27fc9b5..96fa94d 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"
OpenPOWER on IntegriCloud