svn commit: r320436 - stable/11/sys/vm

[Konstantin Belousov]

Author: kib
Date: Wed Jun 28 05:20:28 2017
New Revision: 320436
URL: https://svnweb.freebsd.org/changeset/base/320436

Log:
  MFC r320202:
  Call pmap_copy() only for map entries which have the backing object
  instantiated.
  
  Approved by:	re (delphij)

Modified:
  stable/11/sys/vm/vm_map.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/vm/vm_map.c
==============================================================================
--- stable/11/sys/vm/vm_map.c	Wed Jun 28 04:53:06 2017	(r320435)
+++ stable/11/sys/vm/vm_map.c	Wed Jun 28 05:20:28 2017	(r320436)
@@ -3239,6 +3239,10 @@ vm_map_copy_entry(
 				fake_entry->next = curthread->td_map_def_user;
 				curthread->td_map_def_user = fake_entry;
 			}
+
+			pmap_copy(dst_map->pmap, src_map->pmap,
+			    dst_entry->start, dst_entry->end - dst_entry->start,
+			    src_entry->start);
 		} else {
 			dst_entry->object.vm_object = NULL;
 			dst_entry->offset = 0;
@@ -3248,9 +3252,6 @@ vm_map_copy_entry(
 				*fork_charge += size;
 			}
 		}
-
-		pmap_copy(dst_map->pmap, src_map->pmap, dst_entry->start,
-		    dst_entry->end - dst_entry->start, src_entry->start);
 	} else {
 		/*
 		 * We don't want to make writeable wired pages copy-on-write.