Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Jan 2010 19:25:45 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r203175 - head/sys/vm
Message-ID:  <201001291925.o0TJPj69052950@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Fri Jan 29 19:25:45 2010
New Revision: 203175
URL: http://svn.freebsd.org/changeset/base/203175

Log:
  The MAP_ENTRY_NEEDS_COPY flag belongs to protoeflags, cow variable
  uses different namespace.
  
  Reported by:	Jonathan Anderson <jonathan.anderson cl cam ac uk>
  MFC after:	3 days

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Fri Jan 29 18:33:59 2010	(r203174)
+++ head/sys/vm/vm_map.c	Fri Jan 29 19:25:45 2010	(r203175)
@@ -1136,7 +1136,7 @@ vm_map_insert(vm_map_t map, vm_object_t 
 	    ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) {
 		if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start))
 			return (KERN_RESOURCE_SHORTAGE);
-		KASSERT(object == NULL || (cow & MAP_ENTRY_NEEDS_COPY) ||
+		KASSERT(object == NULL || (protoeflags & MAP_ENTRY_NEEDS_COPY) ||
 		    object->uip == NULL,
 		    ("OVERCOMMIT: vm_map_insert o %p", object));
 		uip = curthread->td_ucred->cr_ruidinfo;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001291925.o0TJPj69052950>