svn commit: r219066 - stable/8/sys/vm

[Alan Cox]

Author: alc
Date: Sat Feb 26 21:27:41 2011
New Revision: 219066
URL: http://svn.freebsd.org/changeset/base/219066

Log:
  MFC r217453
    For some time now, the kernel and kmem objects have been ordinary
    OBJT_PHYS objects.  Thus, there is no need for handling them specially
    in vm_fault().  In fact, this special case handling would have led to
    an assertion failure just before the call to pmap_enter().

Modified:
  stable/8/sys/vm/vm_fault.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/vm/vm_fault.c
==============================================================================
--- stable/8/sys/vm/vm_fault.c	Sat Feb 26 21:24:13 2011	(r219065)
+++ stable/8/sys/vm/vm_fault.c	Sat Feb 26 21:27:41 2011	(r219066)
@@ -397,11 +397,8 @@ RetryFault:;
 			 * found the page ).
 			 */
 			vm_page_busy(fs.m);
-			if (fs.m->valid != VM_PAGE_BITS_ALL &&
-				fs.m->object != kernel_object && fs.m->object != kmem_object) {
+			if (fs.m->valid != VM_PAGE_BITS_ALL)
 				goto readrest;
-			}
-
 			break;
 		}