svn commit: r288302 - stable/10/sys/vm

[Alan Cox]

Author: alc
Date: Sun Sep 27 05:45:16 2015
New Revision: 288302
URL: https://svnweb.freebsd.org/changeset/base/288302

Log:
  MFC r266588
    There is no reason to perform the pmap_remove() on the kernel pmap while
    the kmem object lock is held.  Do the pmap_remove() before acquiring the
    kmem object lock.

Modified:
  stable/10/sys/vm/vm_kern.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_kern.c
==============================================================================
--- stable/10/sys/vm/vm_kern.c	Sun Sep 27 05:29:34 2015	(r288301)
+++ stable/10/sys/vm/vm_kern.c	Sun Sep 27 05:45:16 2015	(r288302)
@@ -396,9 +396,9 @@ kmem_unback(vm_object_t object, vm_offse
 	KASSERT(object == kmem_object || object == kernel_object,
 	    ("kmem_unback: only supports kernel objects."));
 
+	pmap_remove(kernel_pmap, addr, addr + size);
 	offset = addr - VM_MIN_KERNEL_ADDRESS;
 	VM_OBJECT_WLOCK(object);
-	pmap_remove(kernel_pmap, addr, addr + size);
 	for (i = 0; i < size; i += PAGE_SIZE) {
 		m = vm_page_lookup(object, OFF_TO_IDX(offset + i));
 		vm_page_unwire(m, 0);