diff options
| author | dchagin <dchagin@FreeBSD.org> | 2016-07-17 15:23:32 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2016-07-17 15:23:32 +0000 |
| commit | 98960de4ab0561ab3ca3ee2e1bb5cc8657d28b60 (patch) | |
| tree | f201a148eae2ad1b79e9be4db6eca782d08021d1 /sys/modules | |
| parent | 1886392a37bb83dd12e785503919165a4a747671 (diff) | |
| download | FreeBSD-src-98960de4ab0561ab3ca3ee2e1bb5cc8657d28b60.zip FreeBSD-src-98960de4ab0561ab3ca3ee2e1bb5cc8657d28b60.tar.gz | |
MFC r302517:
Fix a copy/paste bug introduced during X86_64 Linuxulator work.
FreeBSD support NX bit on X86_64 processors out of the box, for i386 emulation
use READ_IMPLIES_EXEC flag, introduced in r302515.
While here move common part of mmap() and mprotect() code to the files in compat/linux
to reduce code dupcliation between Linuxulator's.
MFC r302518, r302626:
Add linux_mmap.c to the appropriate conf/files.
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/linux/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/linux_common/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 0e70ce6..124227e 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -30,7 +30,7 @@ SRCS+= opt_apic.h OBJS= ${VDSO}.so .if ${MACHINE_CPUARCH} == "i386" -SRCS+= linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c \ +SRCS+= linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c linux_mmap.c \ linux_emul.c opt_cpu.h linux.c .endif diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 91449f7..2301796 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 linux_emul.c \ +SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux.c opt_compat.h device_if.h vnode_if.h bus_if.h EXPORT_SYMS= |
