From: kettenis <kettenis@openbsd.org>
Date: Wed, 13 Jul 2016 17:49:00 +0000 (+0000)
Subject: Revert previous; the __MAP_NOFAULT test is inverted and the commit message is
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cb8f6a63c110b66bdb903503ed3db1fda9dc7216;p=openbsd

Revert previous; the __MAP_NOFAULT test is inverted and the commit message is
wrong.
---

diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 66c5b81a1f3..ac921faa0fa 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_mmap.c,v 1.135 2016/07/13 15:57:35 kettenis Exp $	*/
+/*	$OpenBSD: uvm_mmap.c,v 1.136 2016/07/13 17:49:00 kettenis Exp $	*/
 /*	$NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -521,7 +521,7 @@ sys_mmap(struct proc *p, void *v, register_t *retval)
 			/* MAP_PRIVATE mappings can always write to */
 			maxprot |= PROT_WRITE;
 		}
-		if ((flags & MAP_ANON) != 0 || (flags & __MAP_NOFAULT) == 0 ||
+		if ((flags & MAP_ANON) != 0 ||
 		    ((flags & MAP_PRIVATE) != 0 && (prot & PROT_WRITE) != 0)) {
 			if (p->p_rlimit[RLIMIT_DATA].rlim_cur < size ||
 			    p->p_rlimit[RLIMIT_DATA].rlim_cur - size <
@@ -541,7 +541,7 @@ sys_mmap(struct proc *p, void *v, register_t *retval)
 
 is_anon:	/* label for SunOS style /dev/zero */
 
-		if ((flags & MAP_ANON) != 0 || (flags & __MAP_NOFAULT) == 0 ||
+		if ((flags & MAP_ANON) != 0 ||
 		    ((flags & MAP_PRIVATE) != 0 && (prot & PROT_WRITE) != 0)) {
 			if (p->p_rlimit[RLIMIT_DATA].rlim_cur < size ||
 			    p->p_rlimit[RLIMIT_DATA].rlim_cur - size <