Module Name: src
Committed By: christos
Date: Sat Apr 29 01:18:35 UTC 2017
Modified Files:
src/sys/uvm: uvm_mmap.c
Log Message:
MAP_COPY is handled in compat
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/uvm/uvm_mmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.162 src/sys/uvm/uvm_mmap.c:1.163
--- src/sys/uvm/uvm_mmap.c:1.162 Tue Aug 9 08:17:04 2016
+++ src/sys/uvm/uvm_mmap.c Fri Apr 28 21:18:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.162 2016/08/09 12:17:04 kre Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.163 2017/04/29 01:18:35 christos Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.162 2016/08/09 12:17:04 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.163 2017/04/29 01:18:35 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_pax.h"
@@ -312,21 +312,6 @@ sys_mmap(struct lwp *l, const struct sys
orig_addr = addr;
#endif /* PAX_ASLR */
- /*
- * Fixup the old deprecated MAP_COPY into MAP_PRIVATE, and
- * validate the flags.
- */
- if (flags & MAP_COPY) {
- flags = (flags & ~MAP_COPY) | MAP_PRIVATE;
-#if defined(COMPAT_10) && defined(__i386__)
- /*
- * Ancient kernel on x86 did not obey PROT_EXEC on i386 at least
- * and ld.so did not turn it on. We take care of this on amd64
- * in compat32.
- */
- prot |= PROT_EXEC;
-#endif
- }
if ((flags & (MAP_SHARED|MAP_PRIVATE)) == (MAP_SHARED|MAP_PRIVATE))
return EINVAL;
